From 994d6ab4f9af6ebcfd7000492792c0f4f2ecdc1c Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 16 Feb 2018 14:04:53 +0300 Subject: [PATCH] Temporarily revert "UAST: Do not create UElements in non-JVM modules" --- plugins/uast-kotlin/build.gradle.kts | 1 - .../org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt | 8 -------- 2 files changed, 9 deletions(-) diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index de83a5d7552..3ceae66fe09 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -8,7 +8,6 @@ dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compile(project(":compiler:light-classes")) - compile(project(":idea:idea-core")) compileOnly(intellijDep()) { includeJars("openapi", "idea", "util", "extensions", "asm-all") } testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt index 7853adb4104..3bb6adeb182 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt @@ -32,14 +32,11 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.idea.KotlinLanguage -import org.jetbrains.kotlin.idea.project.TargetPlatformDetector -import org.jetbrains.kotlin.idea.util.module import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform import org.jetbrains.uast.* import org.jetbrains.uast.kotlin.declarations.KotlinUMethod import org.jetbrains.uast.kotlin.expressions.* @@ -63,16 +60,11 @@ class KotlinUastLanguagePlugin : UastLanguagePlugin { return fileName.endsWith(".kt", false) || fileName.endsWith(".kts", false) } - private val PsiElement.isJvmElement - get() = module?.let { TargetPlatformDetector.getPlatform(it) } is JvmPlatform - override fun convertElement(element: PsiElement, parent: UElement?, requiredType: Class?): UElement? { - if (!element.isJvmElement) return null return convertDeclarationOrElement(element, parent, requiredType) } override fun convertElementWithParent(element: PsiElement, requiredType: Class?): UElement? { - if (!element.isJvmElement) return null if (element is PsiFile) return convertDeclaration(element, null, requiredType) if (element is KtLightClassForFacade) return convertDeclaration(element, null, requiredType)