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

Lint: fix Lint additional checkers with the custom handlers

Browse Source
This commit is contained in:
Yan Zhulanow
2016-03-22 19:45:55 +03:00
parent 37a4d78347
commit 5cf5024d08
2 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/lint/lint-api/src/com/android/tools/klint/client/api/LintDriver.java
+4 -5
View File
@@ -1445,7 +1445,6 @@ public class LintDriver {
if (ideaProject == null) {
return;
}
List<UastLanguagePlugin> plugins = mClient.getLanguagePlugins();
for (JavaContext context : contexts) {
fireEvent(LintListener.EventType.SCANNING_FILE, context);
@@ -1456,10 +1455,10 @@ public class LintDriver {
UastVisitor customVisitor = scanner.createUastVisitor(context);
if (customVisitor != null) {
UastChecker.INSTANCE.checkWithCustomHandler(
ideaProject, context.file, plugins, customVisitor);
ideaProject, context.file, context, customVisitor);
} else {
UastChecker.INSTANCE.check(
ideaProject, context.file, (UastScanner)check, plugins, context);
ideaProject, context.file, (UastScanner)check, context);
}
}
}
@@ -1516,9 +1515,9 @@ public class LintDriver {
for (UastScanner detector : detectors) {
UastVisitor customHandler = detector.createUastVisitor(context);
if (customHandler != null) {
checker.checkWithCustomHandler(intellijProject, file, plugins, customHandler);
checker.checkWithCustomHandler(intellijProject, file, context, customHandler);
} else {
checker.check(intellijProject, file, detector, plugins, context);
checker.check(intellijProject, file, detector, context);
}
}
}
plugins/lint/uast-android/src/org/jetbrains/uast/check/UastChecker.kt
+32 -19
View File
@@ -41,13 +41,24 @@ object UastChecker {
fun checkWithCustomHandler(
project: Project,
file: File,
converters: List<UastLanguagePlugin>,
context: UastAndroidContext,
visitor: UastVisitor) {
check(project, file, converters, UastHandler { visitor.handle(it) })
check(project, file, context, UastHandler { visitor.handle(it) })
}
fun check(project: Project, file: File, plugins: List<UastLanguagePlugin>, handler: UastHandler) {
fun check(project: Project, file: File, context: UastAndroidContext, handler: UastHandler) {
val vfile = VirtualFileManager.getInstance().findFileByUrl("file://" + file.absolutePath) ?: return
val plugins = context.languagePlugins
val additionalCheckers = plugins.fold(mutableListOf<UastAdditionalChecker>()) { list, plugin ->
for (checker in plugin.additionalCheckers) {
if (checker is AndroidUastAdditionalChecker) list += checker
}
list
}
val handlerWrapper = HandlerWrapper(handler, additionalCheckers, context)
ApplicationManager.getApplication().runReadAction {
val psiFile = PsiManager.getInstance(project).findFile(vfile)
@@ -55,12 +66,12 @@ object UastChecker {
when (psiFile) {
is PsiJavaFile -> {
val ufile = JavaUastLanguagePlugin.converter.convertWithParent(psiFile)
ufile?.handleTraverse(handler)
ufile?.handleTraverse(handlerWrapper)
}
else -> for (plugin in plugins) {
val ufile = plugin.converter.convertWithParent(psiFile)
if (ufile != null) {
ufile.handleTraverse(handler)
ufile.handleTraverse(handlerWrapper)
break
}
}
@@ -69,21 +80,27 @@ object UastChecker {
}
}
fun check(project: Project, file: File, scanner: UastScanner, plugins: List<UastLanguagePlugin>, context: UastAndroidContext) {
private class HandlerWrapper(
val original: UastHandler,
val additionalCheckers: List<UastAdditionalChecker>,
val context: UastAndroidContext
) : UastHandler {
override fun invoke(element: UElement) {
original(element)
for (checker in additionalCheckers) {
checker(element, this, context)
}
}
}
fun check(project: Project, file: File, scanner: UastScanner, context: UastAndroidContext) {
val applicableFunctionNames = scanner.applicableFunctionNames ?: emptyList()
val applicableSuperClasses = scanner.applicableSuperClasses ?: emptyList()
val applicableConstructorTypes = scanner.applicableConstructorTypes ?: emptyList()
val appliesToResourcesRefs = scanner.appliesToResourceRefs()
val additionalCheckers = plugins.fold(mutableListOf<UastAdditionalChecker>()) { list, plugin ->
for (checker in plugin.additionalCheckers) {
if (checker is AndroidUastAdditionalChecker) list += checker
}
list
}
var handler: UastHandler? = null
var handler: UastHandler?
handler = UastHandler { element ->
when (element) {
is UCallExpression -> {
@@ -131,13 +148,9 @@ object UastChecker {
}
}
}
for (checker in additionalCheckers) {
checker(element, handler!!, context)
}
}
check(project, file, plugins, handler)
check(project, file, context, handler)
}
}