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

when getting a descriptor for a PsiMethod, also check that it has a valid name (KT-9174)

Browse Source 
#KT-9174 Fixed
This commit is contained in:
Dmitry Jemerov
2015-09-29 18:06:10 +02:00
parent e70f88c67f
commit 4070ba13cd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt
+2 -1
View File
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.load.java.sources.JavaSourceElement import org.jetbrains.kotlin.load.java.sources.JavaSourceElement
import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.load.java.structure.*
import org.jetbrains.kotlin.load.java.structure.impl.* import org.jetbrains.kotlin.load.java.structure.impl.*
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.resolve.scopes.JetScope
@@ -38,7 +39,7 @@ private fun PsiElement.getJavaDescriptorResolver(): JavaDescriptorResolver? {
fun PsiMethod.getJavaMethodDescriptor(): FunctionDescriptor? { fun PsiMethod.getJavaMethodDescriptor(): FunctionDescriptor? {
val method = getOriginalElement() as? PsiMethod ?: return null val method = getOriginalElement() as? PsiMethod ?: return null
if (method.containingClass == null) return null if (method.containingClass == null || !Name.isValidIdentifier(method.getName())) return null
val resolver = method.getJavaDescriptorResolver() val resolver = method.getJavaDescriptorResolver()
return when { return when {
method.isConstructor() -> resolver?.resolveConstructor(JavaConstructorImpl(method)) method.isConstructor() -> resolver?.resolveConstructor(JavaConstructorImpl(method))