azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compilation of new lint checks against IDEA 163

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-10-18 20:35:12 +02:00
parent 05f278ce20
commit b10073465c
6 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintClient.java
+1 -1
View File
@@ -42,7 +42,7 @@ import com.android.repository.api.ProgressIndicatorAdapter;
import com.android.sdklib.BuildToolInfo; import com.android.sdklib.BuildToolInfo;
import com.android.sdklib.IAndroidTarget; import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.SdkVersionInfo; import com.android.sdklib.SdkVersionInfo;
import com.android.sdklib.repositoryv2.AndroidSdkHandler; import com.android.sdklib.repository.AndroidSdkHandler;
import com.android.tools.klint.detector.api.Context; import com.android.tools.klint.detector.api.Context;
import com.android.tools.klint.detector.api.Detector; import com.android.tools.klint.detector.api.Detector;
import com.android.tools.klint.detector.api.Issue; import com.android.tools.klint.detector.api.Issue;
plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintDriver.java
+1 -1
View File
@@ -42,7 +42,7 @@ import com.android.ide.common.res2.ResourceItem;
import com.android.resources.ResourceFolderType; import com.android.resources.ResourceFolderType;
import com.android.sdklib.BuildToolInfo; import com.android.sdklib.BuildToolInfo;
import com.android.sdklib.IAndroidTarget; import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.repositoryv2.AndroidSdkHandler; import com.android.sdklib.repository.AndroidSdkHandler;
import com.android.tools.klint.client.api.LintListener.EventType; import com.android.tools.klint.client.api.LintListener.EventType;
import com.android.tools.klint.detector.api.ClassContext; import com.android.tools.klint.detector.api.ClassContext;
import com.android.tools.klint.detector.api.Context; import com.android.tools.klint.detector.api.Context;
plugins/lint/lint-api/src/com/android/tools/klint/detector/api/ClassContext.java
+1 -2
View File
@@ -28,7 +28,6 @@ import com.android.annotations.Nullable;
import com.android.tools.klint.client.api.LintDriver; import com.android.tools.klint.client.api.LintDriver;
import com.android.tools.klint.detector.api.Location.SearchDirection; import com.android.tools.klint.detector.api.Location.SearchDirection;
import com.android.tools.klint.detector.api.Location.SearchHints; import com.android.tools.klint.detector.api.Location.SearchHints;
import com.android.utils.AsmUtils;
import com.google.common.annotations.Beta; import com.google.common.annotations.Beta;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
@@ -699,7 +698,7 @@ public class ClassContext extends Context {
// If class name contains $, it's not an ambiguous inner class name. // If class name contains $, it's not an ambiguous inner class name.
if (fqcn.indexOf('$') != -1) { if (fqcn.indexOf('$') != -1) {
return AsmUtils.toInternalName(fqcn); return fqcn.replace('.', '/');
} }
// Let's assume that components that start with Caps are class names. // Let's assume that components that start with Caps are class names.
StringBuilder sb = new StringBuilder(fqcn.length()); StringBuilder sb = new StringBuilder(fqcn.length());
plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiDetector.java
+2 -5
View File
@@ -27,11 +27,8 @@ import com.android.resources.ResourceType;
import com.android.sdklib.AndroidVersion; import com.android.sdklib.AndroidVersion;
import com.android.sdklib.BuildToolInfo; import com.android.sdklib.BuildToolInfo;
import com.android.sdklib.SdkVersionInfo; import com.android.sdklib.SdkVersionInfo;
import com.android.sdklib.repositoryv2.AndroidSdkHandler; import com.android.sdklib.repository.AndroidSdkHandler;
import com.android.tools.klint.client.api.IssueRegistry; import com.android.tools.klint.client.api.*;
import com.android.tools.klint.client.api.JavaEvaluator;
import com.android.tools.klint.client.api.LintDriver;
import com.android.tools.klint.client.api.UastLintUtils;
import com.android.tools.klint.detector.api.*; import com.android.tools.klint.detector.api.*;
import com.android.tools.klint.detector.api.Detector.ClassScanner; import com.android.tools.klint.detector.api.Detector.ClassScanner;
import com.intellij.psi.*; import com.intellij.psi.*;
plugins/lint/lint-checks/src/com/android/tools/klint/checks/ApiLookup.java
+1 -1
View File
@@ -25,7 +25,7 @@ import com.android.annotations.NonNull;
import com.android.annotations.Nullable; import com.android.annotations.Nullable;
import com.android.annotations.VisibleForTesting; import com.android.annotations.VisibleForTesting;
import com.android.repository.api.LocalPackage; import com.android.repository.api.LocalPackage;
import com.android.sdklib.repositoryv2.AndroidSdkHandler; import com.android.sdklib.repository.AndroidSdkHandler;
import com.android.tools.klint.client.api.LintClient; import com.android.tools.klint.client.api.LintClient;
//import com.android.tools.klint.client.api.SdkWrapper; //import com.android.tools.klint.client.api.SdkWrapper;
import com.android.tools.klint.detector.api.LintUtils; import com.android.tools.klint.detector.api.LintUtils;
plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijLintClient.java
+3 -3
View File
@@ -7,10 +7,10 @@ import com.android.ide.common.repository.ResourceVisibilityLookup;
import com.android.ide.common.res2.AbstractResourceRepository; import com.android.ide.common.res2.AbstractResourceRepository;
import com.android.ide.common.res2.ResourceFile; import com.android.ide.common.res2.ResourceFile;
import com.android.ide.common.res2.ResourceItem; import com.android.ide.common.res2.ResourceItem;
import com.android.sdklib.repositoryv2.AndroidSdkHandler; import com.android.sdklib.repository.AndroidSdkHandler;
import com.android.tools.idea.gradle.util.Projects; import com.android.tools.idea.gradle.util.Projects;
import com.android.tools.idea.rendering.AppResourceRepository; import com.android.tools.idea.res.AppResourceRepository;
import com.android.tools.idea.rendering.LocalResourceRepository; import com.android.tools.idea.res.LocalResourceRepository;
import com.android.tools.idea.sdk.IdeSdks; import com.android.tools.idea.sdk.IdeSdks;
import com.android.tools.idea.welcome.install.AndroidSdk; import com.android.tools.idea.welcome.install.AndroidSdk;
import com.android.tools.klint.checks.ApiLookup; import com.android.tools.klint.checks.ApiLookup;