MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-CR-56660 UAST: JavaConstructorUCallExpression multiResolve() for constructor methods

Browse Source 
GitOrigin-RevId: 71f22e1151f9ad89e3e26c5845bfbf481744368d
This commit is contained in:
Yuriy Artamonov
2019-12-18 16:03:07 +00:00
committed by intellij-monorepo-bot
parent cc965dbcba
commit 6a01cb2d5e
4 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uast/uast-java/src/org/jetbrains/uast/java/expressions/javaUCallExpressions.kt
+1 -1
View File
@@ -184,7 +184,7 @@ class JavaConstructorUCallExpression(
val methodResolve = sourcePsi.resolveMethodGenerics()
if (methodResolve != JavaResolveResult.EMPTY) {
// if there is a non-default constructor
return arrayOf<ResolveResult>(methodResolve).asIterable()
return listOf<ResolveResult>(methodResolve)
}
// unable to resolve constructor method - resolve to class
val classResolve = sourcePsi.classReference?.multiResolve(false) ?: emptyArray()
uast/uast-tests/java/Simple/ConstructorCallWithParameters.resolved.txt
+14 -14
View File
@@ -1,14 +1,14 @@
UField (name = number) -> UTypeReferenceExpression (name = int) -> null
UParameter (name = number) -> UTypeReferenceExpression (name = int) -> null
UMethod (name = Foo) -> UBlockExpression -> null
UBlockExpression -> UBinaryExpression (operator = =) -> null
UBlockExpression -> UBinaryExpression (operator = =) -> null
UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> [M] PsiFieldImpl
UQualifiedReferenceExpression -> UThisExpression (label = null) -> [M]
UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = number) -> [M] PsiParameterImpl
UMethod (name = test) -> UTypeReferenceExpression (name = void) -> null
UMethod (name = test) -> UBlockExpression -> null
UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> [M] PsiMethodImpl
UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> [M] PsiMethodImpl
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> USimpleNameReferenceExpression (identifier = Foo) -> [M] PsiClassImpl
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> ULiteralExpression (value = 10) -> null
UField (name = number) -> UTypeReferenceExpression (name = int) -> [] ~= []
UParameter (name = number) -> UTypeReferenceExpression (name = int) -> [] ~= []
UMethod (name = Foo) -> UBlockExpression -> [] ~= []
UBlockExpression -> UBinaryExpression (operator = =) -> [] ~= []
UBlockExpression -> UBinaryExpression (operator = =) -> [] ~= []
UBinaryExpression (operator = =) -> UQualifiedReferenceExpression -> [M] PsiFieldImpl ~= PsiField:number
UQualifiedReferenceExpression -> UThisExpression (label = null) -> [M] ~= []
UBinaryExpression (operator = =) -> USimpleNameReferenceExpression (identifier = number) -> [M] PsiParameterImpl ~= PsiParameter:number
UMethod (name = test) -> UTypeReferenceExpression (name = void) -> [] ~= []
UMethod (name = test) -> UBlockExpression -> [] ~= []
UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> [M] PsiMethodImpl ~= PsiMethod:Foo
UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> [M] PsiMethodImpl ~= PsiMethod:Foo
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> USimpleNameReferenceExpression (identifier = Foo) -> [M] PsiClassImpl ~= PsiClass:Foo
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 1)) -> ULiteralExpression (value = 10) -> [] ~= []
uast/uast-tests/java/Simple/DefaultConstructorCall.resolved.txt
+5 -5
View File
@@ -1,5 +1,5 @@
UMethod (name = test) -> UTypeReferenceExpression (name = void) -> null
UMethod (name = test) -> UBlockExpression -> null
UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> [M] PsiClassImpl
UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> [M] PsiClassImpl
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> USimpleNameReferenceExpression (identifier = Foo) -> [M] PsiClassImpl
UMethod (name = test) -> UTypeReferenceExpression (name = void) -> [] ~= []
UMethod (name = test) -> UBlockExpression -> [] ~= []
UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> [M] PsiClassImpl ~= []
UBlockExpression -> UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> [M] PsiClassImpl ~= []
UCallExpression (kind = UastCallKind(name='constructor_call'), argCount = 0)) -> USimpleNameReferenceExpression (identifier = Foo) -> [M] PsiClassImpl ~= PsiClass:Foo
uast/uast-tests/test/org/jetbrains/uast/test/java/AbstractJavaExpressionMultiResolveTest.kt
+12 -3
View File
@@ -24,18 +24,27 @@ abstract class AbstractJavaExpressionMultiResolveTest : AbstractJavaUastTest() {
append(ref.asLogString())
append(" -> ")
append(multiResolve(ref))
append(" ~= ")
append(resolve(ref))
}
}
}.visitUFileAndGetResult(this)
private fun multiResolve(ref: UExpression): String {
if (ref is UMultiResolvable) {
return "[M] " + ref.multiResolve().joinToString(",") { it.element?.javaClass?.simpleName ?: "null" }
return "[M] " + ref.multiResolve().joinToString(",") { it.element?.javaClass?.simpleName ?: "[]" }
}
if (ref is UResolvable) {
return "[S] " + (ref.resolve()?.toString() ?: "null")
return "[S] " + (ref.resolve()?.toString() ?: "[]")
}
return "null"
return "[]"
}
private fun resolve(ref: UExpression): String {
if (ref is UResolvable) {
return (ref.resolve()?.toString() ?: "[]")
}
return "[]"
}
override fun check(testName: String, file: UFile) {