From f8f73d338b5cd9e4b7a95d811afbb2a20e0bf7de Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 12 Jan 2017 14:27:09 +0100 Subject: [PATCH] Use UTryStatement.isResources() instead of getting the resource list (for which there is no portable API ATM) --- .../src/com/android/tools/klint/checks/ApiDetector.java | 5 +---- .../android/inspections/klint/IntellijApiDetector.java | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.java b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.java index b8231e5fb79..7dd9020126e 100644 --- a/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.java +++ b/plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.java @@ -103,7 +103,6 @@ import com.intellij.psi.PsiParameter; import com.intellij.psi.PsiParameterList; import com.intellij.psi.PsiPrimitiveType; import com.intellij.psi.PsiReferenceExpression; -import com.intellij.psi.PsiResourceListElement; import com.intellij.psi.PsiType; import org.jetbrains.uast.*; @@ -2021,9 +2020,7 @@ public class ApiDetector extends ResourceXmlDetector @Override public boolean visitTryExpression(UTryExpression statement) { - List resourceList = statement.getResources(); - //noinspection VariableNotUsedInsideIf - if (resourceList != null && !resourceList.isEmpty()) { + if (statement.isResources()) { int api = 19; // minSdk for try with resources int minSdk = getMinSdk(mContext); diff --git a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijApiDetector.java b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijApiDetector.java index 734674ec481..266b2a6a5a9 100644 --- a/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijApiDetector.java +++ b/plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijApiDetector.java @@ -405,8 +405,7 @@ public class IntellijApiDetector extends ApiDetector { @Override public boolean visitTryExpression(@NotNull UTryExpression statement) { - List resourceList = statement.getResources(); - if (resourceList != null) { + if (statement.isResources()) { int api = 19; // minSdk for try with resources int minSdk = getMinSdk(myContext);