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

FIR UAST: fix import resolve test

Browse Source 
The `resolve` failure (or `null` return) of import directive for
`java.lang.Thread.sleep` is legitimate, since there are two static methods
in `java.lang.Thread`:
https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Thread.html
hence not able to resolve to a single method.

Unless we change `UImportStatement` to be a subtype of `UMultiResolvable`,
instead of `UResolvable`, we can't properly test `resolve` API for that.
This commit is contained in:
Jinseong Jeon
2021-06-09 22:51:54 -07:00
committed by teamcityserver
parent da25d58fa7
commit 3769fd8e07
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin-fir/tests/org/jetbrains/uast/test/kotlin/FirUastResolveApiTest.kt
+6 -4
View File
@@ -40,8 +40,10 @@ class FirUastResolveApiTest : AbstractFirUastTest() {
fun testImports() { fun testImports() {
doCheck("plugins/uast-kotlin/testData/Imports.kt") { _, uFile -> doCheck("plugins/uast-kotlin/testData/Imports.kt") { _, uFile ->
uFile.imports.forEach { uImport -> uFile.imports.forEach { uImport ->
if ((uImport.sourcePsi as? KtImportDirective)?.text?.contains("sleep") == true) { if ((uImport.sourcePsi as? KtImportDirective)?.text?.endsWith("sleep") == true) {
//todo investigate // There are two static [sleep] in [java.lang.Thread], so the import (w/o knowing its usage) can't be resolved to
// a single function, hence `null` (as [resolve] result).
// TODO: make [UImportStatement] a subtype of [UMultiResolvable], instead of [UResolvable]?
return@forEach return@forEach
} }
val resolvedImport = uImport.resolve() val resolvedImport = uImport.resolve()
@@ -52,8 +54,8 @@ class FirUastResolveApiTest : AbstractFirUastTest() {
resolvedImport.name == "Thread" || resolvedImport.name == "UncaughtExceptionHandler" resolvedImport.name == "Thread" || resolvedImport.name == "UncaughtExceptionHandler"
} }
is PsiMethod -> { is PsiMethod -> {
// import java.lang.Thread.(currentThread/sleep) // import java.lang.Thread.currentThread
resolvedImport.name == "currentThread" || resolvedImport.name == "sleep" resolvedImport.name == "currentThread"
} }
is PsiField -> { is PsiField -> {
// import java.lang.Thread.NORM_PRIORITY // import java.lang.Thread.NORM_PRIORITY