Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
25df3bf4
Commit
25df3bf4
authored
2 years ago
by
Jinseong Jeon
Browse files
Options
Download
Email Patches
Plain Diff
FIR UAST: handle resolution to deserialized top-level functions
parent
ed6d88ab
Changes
24
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplexForUInjectionHost.resolved.fir.txt
+9
-9
...d/StringTemplateComplexForUInjectionHost.resolved.fir.txt
plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeReferences.resolved.fir.txt
+5
-5
...r/testData/legacyResolved/TypeReferences.resolved.fir.txt
plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenAndDestructing.resolved.fir.txt
+1
-1
...stData/legacyResolved/WhenAndDestructing.resolved.fir.txt
plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastResolveApiFixtureTest.kt
+4
-0
...st/test/kotlin/comparison/FE1UastResolveApiFixtureTest.kt
with
19 additions
and
15 deletions
+19
-15
plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/StringTemplateComplexForUInjectionHost.resolved.fir.txt
+
9
-
9
View file @
25df3bf4
UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression ->
null: null
UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression ->
null: null
UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression ->
Decompiled_Method: repeat
UPolyadicExpression (operator = +) -> UQualifiedReferenceExpression ->
Decompiled_Method: repeat
UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
UPolyadicExpression (operator = +) -> USimpleNameReferenceExpression (identifier = case4) -> Kotlin_Light_Method: getCase4
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to
null
) -> USimpleNameReferenceExpression (identifier = repeat) -> FUN: repeat
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to
Decompiled_Method
) -> USimpleNameReferenceExpression (identifier = repeat) -> FUN: repeat
UTypeReferenceExpression (name = int) -> USimpleNameReferenceExpression (identifier = Int) -> Decompiled_Class: Integer
UReturnExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
UReturnExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_Light_Value_Parameter: i
...
...
@@ -13,12 +13,12 @@ UReturnExpression -> USimpleNameReferenceExpression (identifier = i) -> Kotlin_L
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Decompiled_Method) -> USimpleNameReferenceExpression (identifier = baz) -> Kotlin_Light_Method: baz
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = simpleForTemplate) -> Kotlin_Light_Method: simpleForTemplate
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = simpleForTemplate) -> Kotlin_Light_Method: simpleForTemplate
ULocalVariable (name = trimA) -> UQualifiedReferenceExpression ->
null: null
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to
null
) -> USimpleNameReferenceExpression (identifier = trimIndent) -> FUN: trimIndent
ULocalVariable (name = trimB) -> UQualifiedReferenceExpression ->
null: null
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to
null
) -> USimpleNameReferenceExpression (identifier = trimMargin) -> FUN: trimMargin
ULocalVariable (name = trimA) -> UQualifiedReferenceExpression ->
Decompiled_Method: trimIndent
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to
Decompiled_Method
) -> USimpleNameReferenceExpression (identifier = trimIndent) -> FUN: trimIndent
ULocalVariable (name = trimB) -> UQualifiedReferenceExpression ->
Decompiled_Method: trimMargin
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to
Decompiled_Method
) -> USimpleNameReferenceExpression (identifier = trimMargin) -> FUN: trimMargin
UBinaryExpression (operator = ==) -> USimpleNameReferenceExpression (identifier = ==) -> null: null
UBinaryExpression (operator = ==) -> UQualifiedReferenceExpression ->
null: null
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to
null
) -> USimpleNameReferenceExpression (identifier = trimIndent) -> FUN: trimIndent
UBinaryExpression (operator = ==) -> UQualifiedReferenceExpression ->
Decompiled_Method: trimIndent
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to
Decompiled_Method
) -> USimpleNameReferenceExpression (identifier = trimIndent) -> FUN: trimIndent
UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> FUN: plus
UBinaryExpression (operator = +) -> USimpleNameReferenceExpression (identifier = +) -> FUN: plus
This diff is collapsed.
Click to expand it.
plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/TypeReferences.resolved.fir.txt
+
5
-
5
View file @
25df3bf4
...
...
@@ -15,13 +15,13 @@ UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifie
UExpressionList (elvis) -> USimpleNameReferenceExpression (identifier = ?:) -> null: null
UTypeReferenceExpression (name = java.util.List<? extends T>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifier = T) -> Kotlin_Light_Type_Parameter: T
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to
null
) -> USimpleNameReferenceExpression (identifier = listOf) -> FUN: listOf
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to
null
) -> USimpleNameReferenceExpression (identifier = at) -> Kotlin_Light_Variable: at
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to
Decompiled_Method
) -> USimpleNameReferenceExpression (identifier = listOf) -> FUN: listOf
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to
Decompiled_Method
) -> USimpleNameReferenceExpression (identifier = at) -> Kotlin_Light_Variable: at
UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
ULocalVariable (name = tsl) -> UQualifiedReferenceExpression ->
null: null
ULocalVariable (name = tsl) -> UQualifiedReferenceExpression ->
Decompiled_Method: map
UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = tl) -> Kotlin_Light_Variable: tl
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to
null
) -> USimpleNameReferenceExpression (identifier = map) -> FUN: map
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to
Decompiled_Method
) -> USimpleNameReferenceExpression (identifier = map) -> FUN: map
UReturnExpression -> UQualifiedReferenceExpression -> null: null
UQualifiedReferenceExpression -> USimpleNameReferenceExpression (identifier = it) -> Kotlin_Light_Value_Parameter: it
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to null) -> USimpleNameReferenceExpression (identifier = toString) -> FUN: toString
...
...
@@ -35,4 +35,4 @@ UTypeReferenceExpression (name = T) -> USimpleNameReferenceExpression (identifie
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 1))(resolves to Kotlin_Light_Method) -> USimpleNameReferenceExpression (identifier = parameterizedFoo) -> Kotlin_Light_Method: parameterizedFoo
UTypeReferenceExpression (name = java.util.List<? extends java.lang.String>) -> USimpleNameReferenceExpression (identifier = List) -> Decompiled_Class: List
UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to
null
) -> USimpleNameReferenceExpression (identifier = emptyList) -> FUN: emptyList
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0))(resolves to
Decompiled_Method
) -> USimpleNameReferenceExpression (identifier = emptyList) -> FUN: emptyList
This diff is collapsed.
Click to expand it.
plugins/kotlin/uast/uast-kotlin-fir/testData/legacyResolved/WhenAndDestructing.resolved.fir.txt
+
1
-
1
View file @
25df3bf4
UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
UTypeReferenceExpression (name = java.lang.String) -> USimpleNameReferenceExpression (identifier = String) -> Decompiled_Class: String
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to
null
) -> USimpleNameReferenceExpression (identifier = listOf) -> FUN: listOf
UCallExpression (kind = UastCallKind(name='method_call'), argCount = 2))(resolves to
Decompiled_Method
) -> USimpleNameReferenceExpression (identifier = listOf) -> FUN: listOf
USwitchExpression -> USimpleNameReferenceExpression (identifier = string) -> Kotlin_Light_Value_Parameter: string
ULocalVariable (name = var837f2350) -> USimpleNameReferenceExpression (identifier = arr) -> Kotlin_Light_Variable: arr
UReturnExpression -> USimpleNameReferenceExpression (identifier = bindingContext) -> Kotlin_Light_Variable: bindingContext
This diff is collapsed.
Click to expand it.
plugins/kotlin/uast/uast-kotlin/tests/test/org/jetbrains/uast/test/kotlin/comparison/FE1UastResolveApiFixtureTest.kt
+
4
-
0
View file @
25df3bf4
...
...
@@ -95,6 +95,10 @@ class FE1UastResolveApiFixtureTest : KotlinLightCodeInsightFixtureTestCase(), Ua
checkListIterator
(
myFixture
)
}
fun
testStringJVM
()
{
checkStringJVM
(
myFixture
)
}
fun
testArgumentMappingDefaultValue
()
{
checkArgumentMappingDefaultValue
(
myFixture
)
}
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment