diff --git a/.idea/libraries/kotlinc_allopen_compiler_plugin.xml b/.idea/libraries/kotlinc_allopen_compiler_plugin.xml index 95cadaf50c7d..16cf5045c7b4 100644 --- a/.idea/libraries/kotlinc_allopen_compiler_plugin.xml +++ b/.idea/libraries/kotlinc_allopen_compiler_plugin.xml @@ -1,18 +1,18 @@ - + - + 928539220011e6f1974ad011960a9701fd7d08a365d1302fc7a48faad02e8407 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_analysis_api_providers.xml b/.idea/libraries/kotlinc_analysis_api_providers.xml index 81008dbcd38b..b17b58682886 100644 --- a/.idea/libraries/kotlinc_analysis_api_providers.xml +++ b/.idea/libraries/kotlinc_analysis_api_providers.xml @@ -1,18 +1,18 @@ - + - + 5b2d0f7f1c745a2e88dd47c69c32f17caacfd74924f91a95a0468c31e45af09a - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_analysis_project_structure.xml b/.idea/libraries/kotlinc_analysis_project_structure.xml index 946348de758a..941c52b67288 100644 --- a/.idea/libraries/kotlinc_analysis_project_structure.xml +++ b/.idea/libraries/kotlinc_analysis_project_structure.xml @@ -1,18 +1,18 @@ - + - + f18de922e93c64767670992f3aba7379f8b9df04fc2612bd03a86e0c0c86b831 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_android_extensions_compiler_plugin.xml b/.idea/libraries/kotlinc_android_extensions_compiler_plugin.xml index 53c488636628..9e08ce1cd244 100644 --- a/.idea/libraries/kotlinc_android_extensions_compiler_plugin.xml +++ b/.idea/libraries/kotlinc_android_extensions_compiler_plugin.xml @@ -1,18 +1,18 @@ - + - + b9cb3b9ab11432f7f7cbcc3acc064925a63d705f0dd23aea8220b529caefeb3f - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_assignment_compiler_plugin.xml b/.idea/libraries/kotlinc_assignment_compiler_plugin.xml index 6cdf73819f41..72bfdee5e209 100644 --- a/.idea/libraries/kotlinc_assignment_compiler_plugin.xml +++ b/.idea/libraries/kotlinc_assignment_compiler_plugin.xml @@ -1,18 +1,18 @@ - + - + f441e426f0c7370e86789296ac54089bac68b088e51b3ac89074e36ff1b85186 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_high_level_api.xml b/.idea/libraries/kotlinc_high_level_api.xml index 70f30117f734..6a08af840e9f 100644 --- a/.idea/libraries/kotlinc_high_level_api.xml +++ b/.idea/libraries/kotlinc_high_level_api.xml @@ -1,18 +1,18 @@ - + - - 1be263d3d41a35bd5807a9cc2f76610d59dcdb2c32c041eeec895a9ac7255a75 + + ac8771b2f05801b233d6148109b8f781985212c766993a4c9e1e3058d17e8a18 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_high_level_api_fe10.xml b/.idea/libraries/kotlinc_high_level_api_fe10.xml index 9a938f3b86ca..25f237eef686 100644 --- a/.idea/libraries/kotlinc_high_level_api_fe10.xml +++ b/.idea/libraries/kotlinc_high_level_api_fe10.xml @@ -1,18 +1,18 @@ - + - - 7ab9daaa0b6a5d0260db7c3ec72a89da1d42e0050a042b207ada6f88d6688ad2 + + 8212d64fe0b78ebc4a76b35a904952f6087027897091eaf8a9b5bbeae446eab2 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_high_level_api_fir.xml b/.idea/libraries/kotlinc_high_level_api_fir.xml index c1300ad184e3..e840e391f39e 100644 --- a/.idea/libraries/kotlinc_high_level_api_fir.xml +++ b/.idea/libraries/kotlinc_high_level_api_fir.xml @@ -1,18 +1,18 @@ - + - - 9993ee356cdc0503ad9464a74644b1b0ca92f455c3860f7577ce97d9b55faf2e + + e74a515cfb60612b90dc9d6ed4f8104790c3f863dad1ea8dacada9a9cc8a7cc0 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_high_level_api_fir_tests.xml b/.idea/libraries/kotlinc_high_level_api_fir_tests.xml index 0d85daedb8fd..ac4771d37aa9 100644 --- a/.idea/libraries/kotlinc_high_level_api_fir_tests.xml +++ b/.idea/libraries/kotlinc_high_level_api_fir_tests.xml @@ -1,18 +1,18 @@ - + - - 8f77eb6a77ea3e66cbf55cc48aaa76cd4353b25640033d924cda75e51ac9f5d3 + + 9563a0cbfc3ab7c908e67ff7c7056552294219642b171d368626516c46433a12 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_high_level_api_impl_base.xml b/.idea/libraries/kotlinc_high_level_api_impl_base.xml index 8c7a69d8e738..2a1ef3ab6daa 100644 --- a/.idea/libraries/kotlinc_high_level_api_impl_base.xml +++ b/.idea/libraries/kotlinc_high_level_api_impl_base.xml @@ -1,18 +1,18 @@ - + - + b88883527dceb053cd812a4031432f2d2e7fa9c2a1c41a6b0e1a9a4aa49178e1 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_high_level_api_impl_base_tests.xml b/.idea/libraries/kotlinc_high_level_api_impl_base_tests.xml index 5367eff353dd..18c70cea0752 100644 --- a/.idea/libraries/kotlinc_high_level_api_impl_base_tests.xml +++ b/.idea/libraries/kotlinc_high_level_api_impl_base_tests.xml @@ -1,18 +1,18 @@ - + - - c9ab61cd3d04510b047c0b9ec6f38e6deb8e5dcdce152ad3574d379f0831d68f + + 24e3f416c34a6928c73bb5a0a203374c1a328fcfedc959c32418dfa6faf051b4 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_incremental_compilation_impl_tests.xml b/.idea/libraries/kotlinc_incremental_compilation_impl_tests.xml index b133264109c2..acc5945b2879 100644 --- a/.idea/libraries/kotlinc_incremental_compilation_impl_tests.xml +++ b/.idea/libraries/kotlinc_incremental_compilation_impl_tests.xml @@ -1,18 +1,18 @@ - + - + 974457ddd47ec3400e986c2ba0a299e6cf37c48b9c816eae108032060c9182d4 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_build_common_tests.xml b/.idea/libraries/kotlinc_kotlin_build_common_tests.xml index bbf48f45469e..29ae09049613 100644 --- a/.idea/libraries/kotlinc_kotlin_build_common_tests.xml +++ b/.idea/libraries/kotlinc_kotlin_build_common_tests.xml @@ -1,18 +1,18 @@ - + - + 7ba70053a5cd92f40fd2c82e9ac4c1910c3adeed5a33697295d648627d09e288 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_compiler_cli.xml b/.idea/libraries/kotlinc_kotlin_compiler_cli.xml index 125c00126221..75f12ffba986 100644 --- a/.idea/libraries/kotlinc_kotlin_compiler_cli.xml +++ b/.idea/libraries/kotlinc_kotlin_compiler_cli.xml @@ -1,18 +1,18 @@ - + - - ae742fbb170666af6c6e8c9a308e00b4249dc4108b8c690c15c299572014b511 + + b462d08827d60ba74e7ecdc7f4a7ec8cf182307494763bca0593be426b0b81a7 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_compiler_common.xml b/.idea/libraries/kotlinc_kotlin_compiler_common.xml index 002d3d4095c3..767f23254a5a 100644 --- a/.idea/libraries/kotlinc_kotlin_compiler_common.xml +++ b/.idea/libraries/kotlinc_kotlin_compiler_common.xml @@ -1,18 +1,18 @@ - + - - 26288a762e00b3adeacec3bbe07295c33adba5345826e8713dcd9295b4e190fd + + 1cdf2dc5e607dd3968049e4b68ab16ad38773b061af24e1a9e57fd360069b375 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_compiler_fe10.xml b/.idea/libraries/kotlinc_kotlin_compiler_fe10.xml index 7be96b5be837..f45dc22d62f2 100644 --- a/.idea/libraries/kotlinc_kotlin_compiler_fe10.xml +++ b/.idea/libraries/kotlinc_kotlin_compiler_fe10.xml @@ -1,18 +1,18 @@ - + - - c1344ba1b06c9f9237e36570b23222de13ad0e497228e106cbd962a08baf79cd + + 9349a7fe89c7fb16cf92ac7dd698677261eedcb53fb5e0f42af3ac37669cd158 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_compiler_fir.xml b/.idea/libraries/kotlinc_kotlin_compiler_fir.xml index 2ea248e2d6ef..4ed973d112e5 100644 --- a/.idea/libraries/kotlinc_kotlin_compiler_fir.xml +++ b/.idea/libraries/kotlinc_kotlin_compiler_fir.xml @@ -1,18 +1,18 @@ - + - - 7b3699b9031534821f39ac10a30573936581cdd9cfb7c2455cbf7279309ea293 + + 44426b835d6b326a0b72886bc064e611a337d2b81e8e88c4035c4ba6bc0c3d26 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_compiler_ir.xml b/.idea/libraries/kotlinc_kotlin_compiler_ir.xml index 8905a3797e2d..5d40d0360e0f 100644 --- a/.idea/libraries/kotlinc_kotlin_compiler_ir.xml +++ b/.idea/libraries/kotlinc_kotlin_compiler_ir.xml @@ -1,18 +1,18 @@ - + - - 472d103b510e9ae9e3623eacfccc58817c56b09527467cc30d81b122b4e38370 + + 3d409e17d8eff5d300dbe671e5f14f5d7c84073e81e021513c5e6c21d35788f0 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_compiler_tests.xml b/.idea/libraries/kotlinc_kotlin_compiler_tests.xml index 1d715d923c53..f70969d61491 100644 --- a/.idea/libraries/kotlinc_kotlin_compiler_tests.xml +++ b/.idea/libraries/kotlinc_kotlin_compiler_tests.xml @@ -1,18 +1,18 @@ - + - - 9cb4ca56b17995208deb01b2359c25a9a8aaa67b2557b407c5a605b9805ef146 + + 3ea1c3b4d400289776110ce92e3cb9e1ecf3da8b421a22585c6479e49a9c66d5 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_gradle_statistics.xml b/.idea/libraries/kotlinc_kotlin_gradle_statistics.xml index 1de2c9dc66a5..c30f1f50eb23 100644 --- a/.idea/libraries/kotlinc_kotlin_gradle_statistics.xml +++ b/.idea/libraries/kotlinc_kotlin_gradle_statistics.xml @@ -1,18 +1,18 @@ - + - + 69c9ec39a529c03de146522b0bd9810710da7d313f4fa89a6152e92a2a7cff56 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_jps_common.xml b/.idea/libraries/kotlinc_kotlin_jps_common.xml index f7c203217e3e..813fb24e3642 100644 --- a/.idea/libraries/kotlinc_kotlin_jps_common.xml +++ b/.idea/libraries/kotlinc_kotlin_jps_common.xml @@ -1,18 +1,18 @@ - + - + 24828bbb5474c58277df57679de2c0ab4c16a65c563c6db19caa7820996e5e13 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath_bootstrap_for_tests.xml b/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath_bootstrap_for_tests.xml index e8aa653e5fc0..d172c8502236 100644 --- a/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath_bootstrap_for_tests.xml +++ b/.idea/libraries/kotlinc_kotlin_jps_plugin_classpath_bootstrap_for_tests.xml @@ -1,18 +1,18 @@ - + - - e2e2bdba4e94c9a73b7f4c8045a768a0c3aa03e8e6a2ad94875b96c60f0a5a63 + + ad23c0abeace5eafb042903ee3ccdab31e6bfc272c2671143e5d66bb547e1a50 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_script_runtime.xml b/.idea/libraries/kotlinc_kotlin_script_runtime.xml index 16a6f2b397ab..ccd0055fed2e 100644 --- a/.idea/libraries/kotlinc_kotlin_script_runtime.xml +++ b/.idea/libraries/kotlinc_kotlin_script_runtime.xml @@ -1,18 +1,18 @@ - + - - 1813404665b36c2688b2751ed97ae106dfb37932fe44a2c5d71b4726a42e9d50 + + 5ee44f41eb737e66c5b922b6d1a5283588fe5c6b41b4727d3a96e70e861b57c4 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_scripting_common.xml b/.idea/libraries/kotlinc_kotlin_scripting_common.xml index 9d6c3ad68bed..9794738d7d7c 100644 --- a/.idea/libraries/kotlinc_kotlin_scripting_common.xml +++ b/.idea/libraries/kotlinc_kotlin_scripting_common.xml @@ -1,18 +1,18 @@ - + - - 90de8673a366ba2604be759bb6e816d435d57d6ca5a945770b01e43b6badf25a + + fd7739d357d1945a0a4c278465cc6c1a9fe1e550da277d9bf9c71509d3a9ea28 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml b/.idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml index 9f6c86fbe669..99a78636e8c8 100644 --- a/.idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml +++ b/.idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml @@ -1,18 +1,18 @@ - + - - 6b1116c99214eb479de08f1ed693fde6c79dc2ae44188c5327541f1279c44fb4 + + 63e640edf491bfde5df60a518c01ceb0ab67dfe4f94a188f12af4a5993237487 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlin_scripting_jvm.xml b/.idea/libraries/kotlinc_kotlin_scripting_jvm.xml index f94fb9be5fde..9c70949fe26a 100644 --- a/.idea/libraries/kotlinc_kotlin_scripting_jvm.xml +++ b/.idea/libraries/kotlinc_kotlin_scripting_jvm.xml @@ -1,18 +1,18 @@ - + - - e4ed1e0d8cdfcc8dd6bd6718e3dc0cc20722cdc5cb51fe6f074dffc7f92d1ee2 + + f9ff67aa7dd909cf2be9e404d78c18dac58c51e6846350a602160c0b61f80c7f - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml b/.idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml index c4fa0e5e0870..47a049c46054 100644 --- a/.idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml +++ b/.idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml @@ -1,18 +1,18 @@ - + - + b12f89a6e93b5d3e8d8ef3935385ef8180875ef980280af66be21e0f50db015c - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_lombok_compiler_plugin.xml b/.idea/libraries/kotlinc_lombok_compiler_plugin.xml index 7e40b9fa4269..0ef198382f31 100644 --- a/.idea/libraries/kotlinc_lombok_compiler_plugin.xml +++ b/.idea/libraries/kotlinc_lombok_compiler_plugin.xml @@ -1,18 +1,18 @@ - + - + 3108fdad9fb74ffe8b001384125545e36a2ff6393e1656939b6d756f2a58542a - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_low_level_api_fir.xml b/.idea/libraries/kotlinc_low_level_api_fir.xml index 12d24d1d1100..369b4c61e4ff 100644 --- a/.idea/libraries/kotlinc_low_level_api_fir.xml +++ b/.idea/libraries/kotlinc_low_level_api_fir.xml @@ -1,18 +1,18 @@ - + - - bf2daa79dcf168be5c28626ec8d94331c0d21578fa49788caa39b3fe2ef0a660 + + d4cd6dc81b67b8f91f323071a40f9a294c91cd0233d15155f7310ffb92dd1664 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_noarg_compiler_plugin.xml b/.idea/libraries/kotlinc_noarg_compiler_plugin.xml index 0a92ef4cabde..ab08b312a57a 100644 --- a/.idea/libraries/kotlinc_noarg_compiler_plugin.xml +++ b/.idea/libraries/kotlinc_noarg_compiler_plugin.xml @@ -1,18 +1,18 @@ - + - + ed18cbd31c81b2bba374d111603c7c3cdd9aa45de01f3f9b371b3f335943ac70 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_parcelize_compiler_plugin.xml b/.idea/libraries/kotlinc_parcelize_compiler_plugin.xml index abe68681cf1b..8528cc66a90f 100644 --- a/.idea/libraries/kotlinc_parcelize_compiler_plugin.xml +++ b/.idea/libraries/kotlinc_parcelize_compiler_plugin.xml @@ -1,18 +1,18 @@ - + - + 9fd40bc1a633be83dfbf8f56bd483fb6ed0662400e59047304ec9660ea48a231 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml b/.idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml index d0e233ba1da8..47003579edbb 100644 --- a/.idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml +++ b/.idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml @@ -1,18 +1,18 @@ - + - + 16aaf2b81ac559cd7de467be17c925b7e11a72cb9973f7da5fec446496ab5e00 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_scripting_compiler_plugin.xml b/.idea/libraries/kotlinc_scripting_compiler_plugin.xml index 9ec11f77b831..8a0dad255815 100644 --- a/.idea/libraries/kotlinc_scripting_compiler_plugin.xml +++ b/.idea/libraries/kotlinc_scripting_compiler_plugin.xml @@ -1,18 +1,18 @@ - + - + 4c86a41c02b3261433026cd88b7fea12c5fdb99aaa95496a14a4e23b98b64501 - + - + \ No newline at end of file diff --git a/.idea/libraries/kotlinc_symbol_light_classes.xml b/.idea/libraries/kotlinc_symbol_light_classes.xml index 94c3422a813d..33d7a5fc3d66 100644 --- a/.idea/libraries/kotlinc_symbol_light_classes.xml +++ b/.idea/libraries/kotlinc_symbol_light_classes.xml @@ -1,18 +1,18 @@ - + - - eab3e76c857d4188acbdb21984e7b36ebe0a81f0ea7bbbcc623b783012e4547c + + ac4bb8dcc54145a55ccaab10fe5d4873cf5fa0a41dabd9e3ab9e6fc0bebca185 - + - + \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/repl/IdeReplExecutionTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/repl/IdeReplExecutionTest.kt index 4f6e00bbe0ad..b4fedb5ca83a 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/repl/IdeReplExecutionTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/repl/IdeReplExecutionTest.kt @@ -106,8 +106,9 @@ class IdeReplExecutionTest : LightPlatformTestCase() { testRunPossibility() } - @Test - fun testOnePlusOne() = testSimpleCommand("1 + 1", "2") + //muted, see KTIJ-28970 + //@Test + //fun onePlusOne() = testSimpleCommand("1 + 1", "2") @Test fun testPrintlnText() = "Hello, console world!".let { testSimpleCommand("println(\"$it\")", it) } diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/util/RedundantUnitExpressionUtil.kt b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/util/RedundantUnitExpressionUtil.kt index c47d2be781b9..e3040c41d4b4 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/util/RedundantUnitExpressionUtil.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.k2/src/org/jetbrains/kotlin/idea/k2/refactoring/util/RedundantUnitExpressionUtil.kt @@ -36,7 +36,7 @@ fun isRedundantUnit(referenceExpression: KtReferenceExpression): Boolean { val parent = referenceExpression.parent ?: return false if (parent is KtReturnExpression) { analyze(parent) { - val expectedReturnType = parent.getReturnTargetSymbol()?.returnType ?: return false + val expectedReturnType = parent.expectedReturnType() ?: return false val expandedClassSymbol = expectedReturnType.expandedClassSymbol return expandedClassSymbol != null && !expectedReturnType.isMarkedNullable && @@ -71,6 +71,11 @@ fun isRedundantUnit(referenceExpression: KtReferenceExpression): Boolean { private fun isDynamicCall(parent: KtBlockExpression): Boolean = parent.getStrictParentOfType()?.findLambdaReturnType() is KtDynamicType +private fun KtReturnExpression.expectedReturnType(): KtType? = analyze(this) { + getReturnTargetSymbol()?.let { + (it.psi as? KtFunctionLiteral)?.findLambdaReturnType() ?: it.returnType + } +} private fun KtFunctionLiteral.findLambdaReturnType(): KtType? { val callExpression = getStrictParentOfType() ?: return null diff --git a/plugins/kotlin/uast/uast-kotlin-fir/tests/testData/legacyTypes/LambdaReturn.types.fir.txt b/plugins/kotlin/uast/uast-kotlin-fir/tests/testData/legacyTypes/LambdaReturn.types.fir.txt index ebb61bdfe128..395d6d3fe69b 100644 --- a/plugins/kotlin/uast/uast-kotlin-fir/tests/testData/legacyTypes/LambdaReturn.types.fir.txt +++ b/plugins/kotlin/uast/uast-kotlin-fir/tests/testData/legacyTypes/LambdaReturn.types.fir.txt @@ -54,7 +54,7 @@ UFile (package = org.jetbrains.uast.kotlin) [package org.jetbrains.uast.kotlin.. ULambdaExpression [fun (@org.jetbrains.annotations.NotNull var a: int) {...}] : PsiType:Function1 UParameter (name = a) [@org.jetbrains.annotations.NotNull var a: int] UAnnotation (fqName = org.jetbrains.annotations.NotNull) [@org.jetbrains.annotations.NotNull] - UBlockExpression [{...}] : PsiType:Void + UBlockExpression [{...}] : PsiType:String UIfExpression [if (a < 5) return "5"] : PsiType:Unit UBinaryExpression (operator = <) [a < 5] : PsiType:boolean USimpleNameReferenceExpression (identifier = a) [a] : PsiType:int @@ -62,7 +62,7 @@ UFile (package = org.jetbrains.uast.kotlin) [package org.jetbrains.uast.kotlin.. UReturnExpression [return "5"] : PsiType:Void UPolyadicExpression (operator = +) ["5"] : PsiType:String ULiteralExpression (value = "5") ["5"] : PsiType:String - UIfExpression [if (a > 0) return "1" else return "2"] : PsiType:Void + UIfExpression [if (a > 0) return "1" else return "2"] : PsiType:String UBinaryExpression (operator = >) [a > 0] : PsiType:boolean USimpleNameReferenceExpression (identifier = a) [a] : PsiType:int ULiteralExpression (value = 0) [0] : PsiType:int diff --git a/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/KotlinUastTypeMapper.kt b/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/KotlinUastTypeMapper.kt index 17ca6d677b52..68aecf26f38c 100644 --- a/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/KotlinUastTypeMapper.kt +++ b/plugins/kotlin/uast/uast-kotlin/src/org/jetbrains/uast/kotlin/internal/KotlinUastTypeMapper.kt @@ -11,7 +11,6 @@ import org.jetbrains.kotlin.codegen.signature.AsmTypeFactory import org.jetbrains.kotlin.codegen.signature.JvmSignatureWriter import org.jetbrains.kotlin.codegen.state.isMostPreciseContravariantArgument import org.jetbrains.kotlin.codegen.state.isMostPreciseCovariantArgument -import org.jetbrains.kotlin.codegen.state.updateArgumentModeFromAnnotations import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.load.kotlin.TypeMappingConfiguration import org.jetbrains.kotlin.load.kotlin.TypeMappingMode diff --git a/plugins/kotlin/util/project-model-updater/resources/model.properties b/plugins/kotlin/util/project-model-updater/resources/model.properties index 811d018e5f91..8c6dee84a547 100644 --- a/plugins/kotlin/util/project-model-updater/resources/model.properties +++ b/plugins/kotlin/util/project-model-updater/resources/model.properties @@ -1,5 +1,5 @@ # Please do not touch this file. It is the responsibility of Kotlin/IntelliJ Kotlin team to advance kotlin compiler version -kotlincVersion=2.0.0-dev-17421 +kotlincVersion=2.0.0-dev-18189 kotlincArtifactsMode=MAVEN jpsPluginVersion=1.9.22-release-704