diff --git a/idea/testData/android/lint/apiCheck.kt.181 b/idea/testData/android/lint/apiCheck.kt.181
index ea9329d4644..af027213faf 100644
--- a/idea/testData/android/lint/apiCheck.kt.181
+++ b/idea/testData/android/lint/apiCheck.kt.181
@@ -42,7 +42,7 @@ class ApiCallTest: Activity() {
// Ok
Bundle().getInt("")
- View.SYSTEM_UI_FLAG_FULLSCREEN
+ View.SYSTEM_UI_FLAG_FULLSCREEN
// Virtual call
getActionBar() // API 11
@@ -61,18 +61,18 @@ class ApiCallTest: Activity() {
GridLayout::class
// Field access
- val field = OpcodeInfo.MAXIMUM_VALUE // API 11
+ val field = OpcodeInfo.MAXIMUM_VALUE // API 11
val fillParent = LayoutParams.FILL_PARENT // API 1
// This is a final int, which means it gets inlined
val matchParent = LayoutParams.MATCH_PARENT // API 8
// Field access: non final
- val batteryInfo = report!!.batteryInfo
+ val batteryInfo = report!!.batteryInfo
// Enum access
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP) {
- val mode = PorterDuff.Mode.OVERLAY // API 11
+ val mode = PorterDuff.Mode.OVERLAY // API 11
}
}
@@ -95,7 +95,7 @@ class ApiCallTest: Activity() {
fun test3(rect: Rect) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
- RectEvaluator(); // ERROR
+ RectEvaluator(); // ERROR
}
}
@@ -104,15 +104,15 @@ class ApiCallTest: Activity() {
System.out.println("Something");
RectEvaluator(rect); // OK
} else {
- RectEvaluator(rect); // ERROR
+ RectEvaluator(rect); // ERROR
}
}
fun test5(rect: Rect) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CUPCAKE) {
- RectEvaluator(rect); // ERROR
+ RectEvaluator(rect); // ERROR
} else {
- RectEvaluator(rect); // ERROR
+ RectEvaluator(rect); // ERROR
}
}
@@ -120,29 +120,29 @@ class ApiCallTest: Activity() {
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
GridLayout(null).getOrientation(); // Not flagged
} else {
- GridLayout(null).getOrientation(); // Flagged
+ GridLayout(null).getOrientation(); // Flagged
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
GridLayout(null).getOrientation(); // Not flagged
} else {
- GridLayout(null).getOrientation(); // Flagged
+ GridLayout(null).getOrientation(); // Flagged
}
if (SDK_INT >= ICE_CREAM_SANDWICH) {
GridLayout(null).getOrientation(); // Not flagged
} else {
- GridLayout(null).getOrientation(); // Flagged
+ GridLayout(null).getOrientation(); // Flagged
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
GridLayout(null).getOrientation(); // Not flagged
} else {
- GridLayout(null).getOrientation(); // Flagged
+ GridLayout(null).getOrientation(); // Flagged
}
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
- GridLayout(null).getOrientation(); // Flagged
+ GridLayout(null).getOrientation(); // Flagged
} else {
GridLayout(null).getOrientation(); // Not flagged
}
@@ -150,24 +150,24 @@ class ApiCallTest: Activity() {
if (Build.VERSION.SDK_INT >= 14) {
GridLayout(null).getOrientation(); // Not flagged
} else {
- GridLayout(null).getOrientation(); // Flagged
+ GridLayout(null).getOrientation(); // Flagged
}
if (VERSION.SDK_INT >= VERSION_CODES.ICE_CREAM_SANDWICH) {
GridLayout(null).getOrientation(); // Not flagged
} else {
- GridLayout(null).getOrientation(); // Flagged
+ GridLayout(null).getOrientation(); // Flagged
}
// Nested conditionals
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
if (priority) {
- GridLayout(null).getOrientation(); // Flagged
+ GridLayout(null).getOrientation(); // Flagged
} else {
- GridLayout(null).getOrientation(); // Flagged
+ GridLayout(null).getOrientation(); // Flagged
}
} else {
- GridLayout(null).getOrientation(); // Flagged
+ GridLayout(null).getOrientation(); // Flagged
}
// Nested conditionals 2
@@ -178,7 +178,7 @@ class ApiCallTest: Activity() {
GridLayout(null).getOrientation(); // Not flagged
}
} else {
- GridLayout(null); // Flagged
+ GridLayout(null); // Flagged
}
}
@@ -186,41 +186,41 @@ class ApiCallTest: Activity() {
if (android.os.Build.VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN) {
GridLayout(null).getOrientation(); // Not flagged
} else {
- GridLayout(null); // Flagged
+ GridLayout(null); // Flagged
}
if (android.os.Build.VERSION.SDK_INT >= 16) {
GridLayout(null).getOrientation(); // Not flagged
} else {
- GridLayout(null); // Flagged
+ GridLayout(null); // Flagged
}
if (android.os.Build.VERSION.SDK_INT >= 13) {
- GridLayout(null).getOrientation(); // Flagged
+ GridLayout(null).getOrientation(); // Flagged
} else {
- GridLayout(null); // Flagged
+ GridLayout(null); // Flagged
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
GridLayout(null).getOrientation(); // Not flagged
} else {
- GridLayout(null); // Flagged
+ GridLayout(null); // Flagged
}
if (SDK_INT >= JELLY_BEAN) {
GridLayout(null).getOrientation(); // Not flagged
} else {
- GridLayout(null); // Flagged
+ GridLayout(null); // Flagged
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
GridLayout(null).getOrientation(); // Not flagged
} else {
- GridLayout(null); // Flagged
+ GridLayout(null); // Flagged
}
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
- GridLayout(null); // Flagged
+ GridLayout(null); // Flagged
} else {
GridLayout(null).getOrientation(); // Not flagged
}
@@ -228,13 +228,13 @@ class ApiCallTest: Activity() {
if (Build.VERSION.SDK_INT >= 16) {
GridLayout(null).getOrientation(); // Not flagged
} else {
- GridLayout(null); // Flagged
+ GridLayout(null); // Flagged
}
if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN) {
GridLayout(null).getOrientation(); // Not flagged
} else {
- GridLayout(null); // Flagged
+ GridLayout(null); // Flagged
}
}
@@ -424,13 +424,13 @@ class ApiCallTest: Activity() {
val linear = layout as LinearLayout // OK API 1
}
- abstract class ErrorVectorDravable : VectorDrawable(), Parcelable
+ abstract class ErrorVectorDravable : VectorDrawable(), Parcelable
@TargetApi(21)
class MyVectorDravable : VectorDrawable()
fun testTypes() {
- GridLayout(this)
+ GridLayout(this)
val c = VectorDrawable::class.java
}
diff --git a/idea/testData/android/lint/javaPerformance.kt.181 b/idea/testData/android/lint/javaPerformance.kt.181
index 25025526173..0bf3b5f0957 100644
--- a/idea/testData/android/lint/javaPerformance.kt.181
+++ b/idea/testData/android/lint/javaPerformance.kt.181
@@ -23,8 +23,8 @@ class JavaPerformanceTest(context: Context, attrs: AttributeSet, defStyle: Int)
super.onDraw(canvas)
// Various allocations:
- java.lang.String("foo")
- val s = java.lang.String("bar")
+ java.lang.String("foo")
+ val s = java.lang.String("bar")
// This one should not be reported:
@SuppressLint("DrawAllocation")
@@ -69,11 +69,11 @@ class JavaPerformanceTest(context: Context, attrs: AttributeSet, defStyle: Int)
// Should use SparseBooleanArray
val myBoolMap = HashMap()
// Should use SparseIntArray
- val myIntMap = java.util.HashMap()
+ val myIntMap = java.util.HashMap()
// This one should not be reported:
@SuppressLint("UseSparseArrays")
- val myOtherMap = HashMap()
+ val myOtherMap = HashMap()
}
protected fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int,
@@ -100,20 +100,20 @@ class JavaPerformanceTest(context: Context, attrs: AttributeSet, defStyle: Int)
override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int,
bottom: Int) {
- java.lang.String("flag me")
+ java.lang.String("flag me")
}
@SuppressWarnings("null") // not real code
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
- java.lang.String("flag me")
+ java.lang.String("flag me")
// Forbidden factory methods:
- Bitmap.createBitmap(100, 100, null)
- android.graphics.Bitmap.createScaledBitmap(null, 100, 100, false)
- BitmapFactory.decodeFile(null)
+ Bitmap.createBitmap(100, 100, null)
+ android.graphics.Bitmap.createScaledBitmap(null, 100, 100, false)
+ BitmapFactory.decodeFile(null)
val canvas: Canvas? = null
- canvas!!.getClipBounds() // allocates on your behalf
- canvas.clipBounds // allocates on your behalf
+ canvas!!.getClipBounds() // allocates on your behalf
+ canvas.clipBounds // allocates on your behalf
canvas.getClipBounds(null) // NOT an error
val layoutWidth = width
@@ -137,7 +137,7 @@ class JavaPerformanceTest(context: Context, attrs: AttributeSet, defStyle: Int)
// NOT lazy initialization
if (!initialized || mOverlay == null) {
- java.lang.String("foo")
+ java.lang.String("foo")
}
}
diff --git a/idea/testData/android/lint/setJavaScriptEnabled.kt.181 b/idea/testData/android/lint/setJavaScriptEnabled.kt.181
index ca41821d6ac..ed3a506e719 100644
--- a/idea/testData/android/lint/setJavaScriptEnabled.kt.181
+++ b/idea/testData/android/lint/setJavaScriptEnabled.kt.181
@@ -8,8 +8,8 @@ import android.webkit.WebView
public class HelloWebApp : Activity() {
fun test(webView: WebView) {
- webView.settings.javaScriptEnabled = true // bad
- webView.getSettings().setJavaScriptEnabled(true) // bad
+ webView.settings.javaScriptEnabled = true // bad
+ webView.getSettings().setJavaScriptEnabled(true) // bad
webView.getSettings().setJavaScriptEnabled(false) // good
webView.loadUrl("file:///android_asset/www/index.html")
}
diff --git a/idea/testData/android/lint/toast.kt.181 b/idea/testData/android/lint/toast.kt.181
index 573382e15c5..06d9af08abe 100644
--- a/idea/testData/android/lint/toast.kt.181
+++ b/idea/testData/android/lint/toast.kt.181
@@ -24,7 +24,7 @@ class ToastTest(context: Context) : Activity() {
}
Runnable {
- Toast.makeText(context, "foo", Toast.LENGTH_LONG)
+ Toast.makeText(context, "foo", Toast.LENGTH_LONG)
}
}
@@ -45,13 +45,13 @@ class ToastTest(context: Context) : Activity() {
private fun broken(context: Context) {
// Errors
- Toast.makeText(context, "foo", Toast.LENGTH_LONG)
- val toast = Toast.makeText(context, R.string.app_name, 5000)
+ Toast.makeText(context, "foo", Toast.LENGTH_LONG)
+ val toast = Toast.makeText(context, R.string.app_name, 5000)
toast.duration
}
init {
- Toast.makeText(context, "foo", Toast.LENGTH_LONG)
+ Toast.makeText(context, "foo", Toast.LENGTH_LONG)
}
@android.annotation.SuppressLint("ShowToast")
diff --git a/idea/testData/android/lint/viewHolder.kt.181 b/idea/testData/android/lint/viewHolder.kt.181
index d0b8d23d7cb..551027b35f8 100644
--- a/idea/testData/android/lint/viewHolder.kt.181
+++ b/idea/testData/android/lint/viewHolder.kt.181
@@ -27,7 +27,7 @@ abstract class ViewHolderTest : BaseAdapter() {
override fun getView(position: Int, convertView: View, parent: ViewGroup): View {
var convertView = convertView
// Should use View Holder pattern here
- convertView = mInflater.inflate(R.layout.your_layout, null)
+ convertView = mInflater.inflate(R.layout.your_layout, null)
val text: TextView = convertView.findViewById(R.id.text)
text.text = "Position " + position