MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Uast: check if UastAdapers used as DataHolders (EA-239759)"

Browse Source 
This reverts commit ccd5768d
because of IDEA-255643, IDEA-255649

GitOrigin-RevId: 2572a3634291a3f391063eca7f6ac204b906da7a
This commit is contained in:
Nicolay Mitropolsky
2020-11-18 15:29:19 +03:00
committed by intellij-monorepo-bot
parent b14fc6dc7b
commit 0f0f473b2f
2 changed files with 0 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/java-psi-impl/src/META-INF/JavaPsiPlugin.xml
View File

@@ -140,7 +140,6 @@
<extensions defaultExtensionNs="com.intellij">
<registryKey defaultValue="30" description="UAST usages graph building depth limit" key="uast.usage.graph.default.recursion.depth.limit"/>
<registryKey defaultValue="false" description="UAST check adapters not used as Data Holders" key="uast.adapter.check.dataHolder"/>
</extensions>
<extensions defaultExtensionNs="com.intellij.jvm">

60
uast/uast-common/src/org/jetbrains/uast/declarations/adapters.kt
View File

@@ -5,10 +5,6 @@
package org.jetbrains.uast
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.util.Key
import com.intellij.openapi.util.registry.Registry
import com.intellij.psi.*
/*
@@ -59,16 +55,6 @@ abstract class UClassAdapter(psiClass: PsiClass) : UClass, PsiClass by psiClass
override fun getOriginalElement(): PsiElement? = javaPsi
override fun getSourceElement(): PsiElement? = sourcePsi
// added to catch EA-239759
override fun <T : Any?> getUserData(key: Key<T>): T? {
if (Registry.`is`("uast.adapter.check.dataHolder")
&& ApplicationManager.getApplication().run { isUnitTestMode || isInternal || isEAP }) {
logger<UClassAdapter>().error("Uast should not be used as dataHolder")
}
return javaPsi.getUserData(key)
}
}
@@ -106,15 +92,6 @@ abstract class UAnonymousClassAdapter(psiAnonymousClass: PsiAnonymousClass)
override fun getOriginalElement(): PsiElement? = javaPsi
override fun getSourceElement(): PsiElement? = sourcePsi
// added to catch EA-239759
override fun <T : Any?> getUserData(key: Key<T>): T? {
if (Registry.`is`("uast.adapter.check.dataHolder")
&& ApplicationManager.getApplication().run { isUnitTestMode || isInternal || isEAP }) {
logger<UAnonymousClassAdapter>().error("Uast should not be used as dataHolder")
}
return javaPsi.getUserData(key)
}
}
abstract class UClassInitializerAdapter(psiClassInitializer: PsiClassInitializer)
@@ -123,15 +100,6 @@ abstract class UClassInitializerAdapter(psiClassInitializer: PsiClassInitializer
override fun getOriginalElement(): PsiElement? = javaPsi
override fun getSourceElement(): PsiElement? = sourcePsi
// added to catch EA-239759
override fun <T : Any?> getUserData(key: Key<T>): T? {
if (Registry.`is`("uast.adapter.check.dataHolder")
&& ApplicationManager.getApplication().run { isUnitTestMode || isInternal || isEAP }) {
logger<UClassInitializerAdapter>().error("Uast should not be used as dataHolder")
}
return javaPsi?.getUserData(key)
}
}
abstract class UDeclarationAdapter(psiJvmModifiersOwner: PsiJvmModifiersOwner)
@@ -140,15 +108,6 @@ abstract class UDeclarationAdapter(psiJvmModifiersOwner: PsiJvmModifiersOwner)
override fun getOriginalElement(): PsiElement? = javaPsi
override fun getSourceElement(): PsiElement? = sourcePsi
// added to catch EA-239759
override fun <T : Any?> getUserData(key: Key<T>): T? {
if (Registry.`is`("uast.adapter.check.dataHolder")
&& ApplicationManager.getApplication().run { isUnitTestMode || isInternal || isEAP }) {
logger<UDeclarationAdapter>().error("Uast should not be used as dataHolder")
}
return javaPsi?.getUserData(key)
}
}
abstract class UAnchorOwnerAdapter : UAnchorOwner
@@ -162,15 +121,6 @@ abstract class UMethodAdapter(private val psiMethod: PsiMethod) : UMethod, PsiMe
override fun getOriginalElement(): PsiElement? = sourcePsi?.originalElement
override fun getSourceElement(): PsiElement? = psiMethod.sourceElement
// added to catch EA-239759
override fun <T : Any?> getUserData(key: Key<T>): T? {
if (Registry.`is`("uast.adapter.check.dataHolder")
&& ApplicationManager.getApplication().run { isUnitTestMode || isInternal || isEAP }) {
logger<UMethodAdapter>().error("Uast should not be used as dataHolder")
}
return javaPsi.getUserData(key)
}
}
abstract class UAnnotationMethodAdapter(private val psiAnnotationMethod: PsiAnnotationMethod)
@@ -203,16 +153,6 @@ abstract class UFieldAdapter(private val psiField: PsiField)
override fun getOriginalElement(): PsiElement? = sourcePsi?.originalElement
override fun getSourceElement(): PsiElement? = psiField.sourceElement
// added to catch EA-239759
override fun <T : Any?> getUserData(key: Key<T>): T? {
if (Registry.`is`("uast.adapter.check.dataHolder")
&& ApplicationManager.getApplication().run { isUnitTestMode || isInternal || isEAP }) {
logger<UFieldAdapter>().error("Uast should not be used as dataHolder")
}
return psiField.getUserData(key)
}
}
abstract class ULocalVariableAdapter(psiLocalVariable: PsiLocalVariable)