From cce7bbe65695ce848767b72b9df52d69ea8b9f34 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Sat, 2 Oct 2021 22:09:48 +0200 Subject: [PATCH] [kotlin:testdata] Cherry-pick testdata changes from kt-212-master Included changes: 35616cdf5b0b1 [testdata] Temporary mute QuickFixMultiModuleTestGenerated $Other.testAddActualTo[Class|TopLevelMember] 942c262a49f7c [testdata] Update testdata for ContinuationStackTraceTestGenerated dc605d52ad20c [testdata] Fix KotlinJpsBuildTestIncremental.testLanguageVersionChanged a6d66837c7445 [testdata] [Ir]KotlinEvaluateExpression[With[IR]FragmentCompiler]TestGenerated 6866335cdcdbc [kotlin:testdata] Update test data for KotlinHighlightVisitorTestGenerated cfe5fcbe6245a [kotlin:testdata] Removed MultiModuleHighlightingTest related to -Xexperimental compiler key 268506919a0f9 [kotlin:testdata] Do not store files into working directory during MultiModuleHighlightingTest 79a302dff7cff [kotlin:testdata] Remove outdated autogenerated files 4e0c2041598b2 [kotlin:testdata] Remove outdated DiagnosticMessageTestGenerated test b1b14b30f2651 [kotlin:testdata] LocalInspectionTestGenerated: KTIJ-19621 & fix FIR ignore comments 38ddb660f231e [kotlin:testdata] Update testdata for IntentionTestGenerated fec077041f9bd [kotlin:testdata] QuickFixMultiModuleTestGenerated$CreateActual.testValueClass 1536ea4479359 [kotlin:testdata] Update testdata in QuickFixTestGenerated d2b29ca96369e [kotlin:testdata] KdocResolveTestGenerated: fix testData 0346e4c707c8d [kotlin:testdata] Update ProjectTemplateBuildFileGenerationTestGenerated testdata 2d72020988a3b [kotlin:testdata] MultiPlatformHighlightingTestGenerated.testJvmKotlinReferencesCommonKotlinThroughJavaDifferentJvmImpls 11446d9cceafd [kotlin:testdata] KotlinSSCountFilterTest.testMaxWhenConditionWithExpression adb23244ba74c [kotlin:testdata] ReferenceResolveTestGenerated.testJavaParameter 5a2468edca8d1 [kotlin:testdata] Update the asm version in AsmVersionForJpsBuildTest 3d0bb0f9b944c [kotlin:testdata] Update testdata for HighlightingMetaInfoTestGenerated.testKotlinInjection b74ff2b966fe2 [kotlin] Update testdata about find usages 6e0696a90adeb Enable JVM IR for stdlib/reflect/test libraries 5d4c65ab7df9c [kotlin:testdata] Fix test GradleKtsImportTest.testError faa3a5e42cbd9 [kotlin, formatter] fix testData for kt-212-master 7d59be2d16a13 UAST: update tests (compiled kotlin.text.Regex) a6666f1b6ef77 [kotlin] JvmSmartCompletionTestGenerated: update testData GitOrigin-RevId: b67c98e262415c5cf410e2062b4a3879b08efab1 --- .../codeInsight/gradle/GradleKtsImportTest.kt | 2 +- .../resolve/MultiModuleHighlightingTest.kt | 45 +--------- .../DiagnosticMessageTestGenerated.java | 5 ++ .../testData/checker/ExtensionFunctions.kt | 4 +- .../tests/testData/checker/UnreachableCode.kt | 6 +- .../testData/checker/WhenNonExhaustive.kt | 2 +- .../regression/SpecififcityByReceiver.kt | 2 +- .../testData/diagnosticMessage/urlRender.kt | 5 -- .../diagnosticMessage/urlRender1.html | 3 - ...alClassDerivedAnonymousObjects.results.txt | 2 +- ...tlinOverloadAndExtensionUsages.results.txt | 10 +-- .../kotlinPrivatePropertyUsages2.results.txt | 4 +- .../kotlinPropertyReadUsages.results.txt | 2 +- .../kotlinPropertyReadUsages2.results.txt | 2 +- .../kotlinPropertyUsages.results.txt | 4 +- .../kotlinPropertyUsages2.results.txt | 4 +- .../kotlinPropertyWriteUsages.results.txt | 2 +- .../kotlinPropertyWriteUsages2.results.txt | 2 +- .../kotlinPropertyUsages.results.txt | 4 +- .../kotlinPropertyUsages.results.txt | 4 +- .../LibraryMethodUsages.results.txt | 2 +- .../LibraryFunctionUsages.results.txt | 4 +- .../LibraryMemberFunctionUsages.results.txt | 4 +- ...estedClassMemberFunctionUsages.results.txt | 4 +- ...dClassPrimaryConstructorUsages.results.txt | 4 +- ...lassSecondaryConstructorUsages.results.txt | 4 +- .../LibraryNestedClassUsages.results.txt | 10 +-- .../LibraryObjectUsages.results.txt | 2 +- ...ibraryPrimaryConstructorUsages.results.txt | 4 +- ...rarySecondaryConstructorUsages.results.txt | 4 +- .../highlighterMetaInfo/KotlinInjection.kt | 1 + .../KotlinInjection.kt.highlighting | 3 +- .../KotlinInjection.kt.highlighting.fir | 6 -- .../internalInPrivateClass.kt | 4 +- .../internalInPrivateClass.kt.after | 4 +- .../publicOverrideProtectedSetter3.kt | 4 +- .../publicOverrideProtectedSetter3.kt.after | 4 +- .../publicOverrideProtectedSetter6.kt | 4 +- .../publicOverrideProtectedSetter6.kt.after | 4 +- .../redundantWith/asInitializer.kt | 4 +- .../redundantWith/asInitializer.kt.after | 5 -- .../valueIsAnonymousObject3.kt.after | 1 + .../hasAnnotation.kt | 1 + .../kdoc/resolve/ExtensionFromImports.kt | 2 +- .../jsExperimentalLibrary/lib/lib.kt | 8 -- .../jsExperimentalLibrary/usage/usage.kt | 14 ---- .../jvmExperimentalLibrary/lib/lib.kt | 8 -- .../jvmExperimentalLibrary/usage/usage.kt | 14 ---- .../dependencies.txt | 3 + .../createActual/valueClass/jvm/IC.kt | 0 .../jvm/{ic.kt.after => IC.kt.after} | 0 .../other/addActualToClass/header/header.kt | 2 + .../addActualToClass/header/header.kt.after | 1 - .../other/addActualToClass/jvm/jvm.kt | 6 +- .../other/addActualToClass/jvm/jvm.kt.after | 3 - .../header/header.kt.after | 1 - .../addActualToTopLevelMember/jvm/jvm.kt | 5 +- .../jvm/jvm.kt.after | 3 - .../memberExtensionPropertyVarGetterOnly.kt | 2 +- .../invokeOperator2.kt.after | 2 +- .../nullableBinaryExpression.kt.after | 2 +- .../refactorNullableFunctionTypeProperty2.kt | 3 - ...ctorNullableFunctionTypeProperty2.kt.after | 5 +- .../resolve/references/JavaParameter.kt | 4 +- .../maxWhenConditionWithExpression.kt | 6 +- .../test/testData/continuation/suspendFun.out | 2 +- .../continuation/suspendFunWithInner.out | 2 +- .../testData/continuation/suspendLambda.out | 2 +- ...itionForGetterWithDiamondInterfaces.ir.out | 14 ---- .../evaluation/singleBreakpoint/kt22366.kt | 2 +- .../lambdas/inlineFunctionalExpression.ir.out | 7 -- .../lambdas/inlineFunctionalExpression.out | 2 +- .../xcoroutines/coroutineSuspendFun.out | 2 +- .../xcoroutines/coroutineSuspendFun136.out | 2 +- .../test/testData/xcoroutines/suspendMain.out | 2 +- .../android/expected/build.gradle | 2 +- .../android/expected/build.gradle.kts | 2 +- .../expected/build.gradle.kts | 4 +- .../fullStackWebApplication/build.gradle | 9 +- .../fullStackWebApplication/build.gradle.kts | 9 +- .../tests/testData/Regex.compiled.log | 83 ++++++++++--------- 81 files changed, 160 insertions(+), 281 deletions(-) delete mode 100644 plugins/kotlin/idea/tests/testData/diagnosticMessage/urlRender.kt delete mode 100644 plugins/kotlin/idea/tests/testData/diagnosticMessage/urlRender1.html delete mode 100644 plugins/kotlin/idea/tests/testData/highlighterMetaInfo/KotlinInjection.kt.highlighting.fir delete mode 100644 plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantWith/asInitializer.kt.after delete mode 100644 plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jsExperimentalLibrary/lib/lib.kt delete mode 100644 plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jsExperimentalLibrary/usage/usage.kt delete mode 100644 plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jvmExperimentalLibrary/lib/lib.kt delete mode 100644 plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jvmExperimentalLibrary/usage/usage.kt create mode 100644 plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/valueClass/jvm/IC.kt rename plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/valueClass/jvm/{ic.kt.after => IC.kt.after} (100%) delete mode 100644 plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/header/header.kt.after delete mode 100644 plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/jvm/jvm.kt.after delete mode 100644 plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToTopLevelMember/header/header.kt.after delete mode 100644 plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToTopLevelMember/jvm/jvm.kt.after delete mode 100644 plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/frame/sourcePositionForGetterWithDiamondInterfaces.ir.out delete mode 100644 plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/lambdas/inlineFunctionalExpression.ir.out diff --git a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt index eea16957fff5..0a33aa6fc01c 100644 --- a/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt +++ b/plugins/kotlin/gradle/gradle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleKtsImportTest.kt @@ -79,7 +79,7 @@ abstract class GradleKtsImportTest : KotlinGradleImportingTestCase() { "$expectedErrorMessage error has not been reported among other errors: $errors", buildScriptErrors.isNotEmpty() ) - checkConfiguration("build.gradle.kts") + } } class CompositeBuild2 : GradleKtsImportTest() { diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt index 0bf1143c1649..d20113c85b84 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt @@ -234,48 +234,13 @@ open class MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() { checkHighlightingInProject() } - fun testJvmExperimentalLibrary() { - val sources = listOf(File(testDataPath, getTestName(true) + "/lib")) - val extraOptions = listOf( - "-Xopt-in=kotlin.RequiresOptIn", - "-Xexperimental=lib.ExperimentalAPI" - ) - - val lib = KotlinCompilerStandalone(sources, options = extraOptions).compile() - - module("usage").addLibrary(lib) - checkHighlightingInProject() - } - - fun testJsExperimentalLibrary() { - val sources = listOf(File(testDataPath, getTestName(true) + "/lib")) - val extraOptions = listOf( - "-Xopt-in=kotlin.RequiresOptIn", - "-Xexperimental=lib.ExperimentalAPI" - ) - - val lib = KotlinCompilerStandalone( - sources, - platform = KotlinCompilerStandalone.Platform.JavaScript(MockLibraryFacility.MOCK_LIBRARY_NAME, "lib"), - options = extraOptions - ).compile() - - val usageModule = module("usage") - usageModule.makeJsModule() - usageModule.addLibrary(lib, kind = JSLibraryKind) - - checkHighlightingInProject() - } - fun testResolutionAnchorsAndBuiltins() { val jarForCompositeLibrary = KotlinCompilerStandalone( - sources = listOf(File("$testDataPath${getTestName(true)}/compositeLibraryPart")), - target = File("compositeLibraryPart") + sources = listOf(File("$testDataPath${getTestName(true)}/compositeLibraryPart")) ).compile() val stdlibJarForCompositeLibrary = KotlinArtifacts.instance.kotlinStdlib val jarForSourceDependentLibrary = KotlinCompilerStandalone( - sources = listOf(File("$testDataPath${getTestName(true)}/sourceDependentLibrary")), - target = File("sourceDependentLibrary") + sources = listOf(File("$testDataPath${getTestName(true)}/sourceDependentLibrary")) ).compile() val dependencyModule = module("dependencyModule") @@ -324,10 +289,4 @@ open class MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() { } } - private fun Module.makeJsModule() { - setupKotlinFacet { - settings.compilerArguments = K2JSCompilerArguments() - settings.targetPlatform = JSLibraryKind.compilerPlatform - } - } } diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java index 7812b8a4dc5f..fd07776a6216 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java @@ -287,4 +287,9 @@ public class DiagnosticMessageTestGenerated extends AbstractDiagnosticMessageTes public void testUrlRender() throws Exception { runTest("testData/diagnosticMessage/urlRender.kt"); } + + @TestMetadata("upperBoundViolatedInTypeAliasConstructorCall.kt") + public void testUpperBoundViolatedInTypeAliasConstructorCall() throws Exception { + runTest("testData/diagnosticMessage/upperBoundViolatedInTypeAliasConstructorCall.kt"); + } } diff --git a/plugins/kotlin/idea/tests/testData/checker/ExtensionFunctions.kt b/plugins/kotlin/idea/tests/testData/checker/ExtensionFunctions.kt index a61578e44f2e..5d67c901eda7 100644 --- a/plugins/kotlin/idea/tests/testData/checker/ExtensionFunctions.kt +++ b/plugins/kotlin/idea/tests/testData/checker/ExtensionFunctions.kt @@ -6,7 +6,7 @@ fun T.foo(?.minus(this) + this?.minus(this) return this } @@ -64,7 +64,7 @@ fun Int.foo() = this command?.equals1(null) val c = Command() - c?.equals2(null) + c?.equals2(null) if (command == null) 1 } diff --git a/plugins/kotlin/idea/tests/testData/checker/UnreachableCode.kt b/plugins/kotlin/idea/tests/testData/checker/UnreachableCode.kt index 1f1c1c5245b9..059e6e883c6e 100644 --- a/plugins/kotlin/idea/tests/testData/checker/UnreachableCode.kt +++ b/plugins/kotlin/idea/tests/testData/checker/UnreachableCode.kt @@ -66,12 +66,12 @@ fun t5() : Int { return 1 2 } - while (1 > 2) + while (1 > 2) return 1 } fun t6() : Int { - while (1 > 2) { + while (1 > 2) { return 1 2 } @@ -79,7 +79,7 @@ fun t6() : Int { } fun t6break() : Int { - while (1 > 2) { + while (1 > 2) { break 2 } diff --git a/plugins/kotlin/idea/tests/testData/checker/WhenNonExhaustive.kt b/plugins/kotlin/idea/tests/testData/checker/WhenNonExhaustive.kt index f14534fed71a..88a3b9722ec6 100644 --- a/plugins/kotlin/idea/tests/testData/checker/WhenNonExhaustive.kt +++ b/plugins/kotlin/idea/tests/testData/checker/WhenNonExhaustive.kt @@ -27,7 +27,7 @@ fun nonExhaustiveNullable(c: Color?) = when(c) { + when(c) { Color.BLUE -> {} Color.GREEN -> {} } diff --git a/plugins/kotlin/idea/tests/testData/checker/regression/SpecififcityByReceiver.kt b/plugins/kotlin/idea/tests/testData/checker/regression/SpecififcityByReceiver.kt index 1fac1837910b..ff2acda4a323 100644 --- a/plugins/kotlin/idea/tests/testData/checker/regression/SpecififcityByReceiver.kt +++ b/plugins/kotlin/idea/tests/testData/checker/regression/SpecififcityByReceiver.kt @@ -6,6 +6,6 @@ fun main(args val command : Any = 1 - command?.equals(null) + command?.equals(null) command.equals(null) } diff --git a/plugins/kotlin/idea/tests/testData/diagnosticMessage/urlRender.kt b/plugins/kotlin/idea/tests/testData/diagnosticMessage/urlRender.kt deleted file mode 100644 index 8a76ed1f2428..000000000000 --- a/plugins/kotlin/idea/tests/testData/diagnosticMessage/urlRender.kt +++ /dev/null @@ -1,5 +0,0 @@ -// !DIAGNOSTICS_NUMBER: 1 -// !DIAGNOSTICS: UNSUPPORTED_FEATURE -// LANGUAGE_VERSION: 1.0 - -suspend fun test() {} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/diagnosticMessage/urlRender1.html b/plugins/kotlin/idea/tests/testData/diagnosticMessage/urlRender1.html deleted file mode 100644 index dd2ce04912ec..000000000000 --- a/plugins/kotlin/idea/tests/testData/diagnosticMessage/urlRender1.html +++ /dev/null @@ -1,3 +0,0 @@ - - -The feature "coroutines" is only available since language version 1.1 (see more here) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.results.txt index 461a4f86cd44..c55163a3057b 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.results.txt @@ -1,4 +1,4 @@ Unclassified 11 val c = object : A() {} Unclassified 13 val d = object : T() {} Unclassified 6 val b = object : A() {} -Unclassified 8 open class T : A() +Unclassified 8 open class T : A() \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.results.txt index b0eb538959fe..fce7d0c93423 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.results.txt @@ -1,7 +1,7 @@ -[kotlinOverloadAndExtensionUsages.0.kt] Function call 13 x.foo(1, 2) -[kotlinOverloadAndExtensionUsages.0.kt] Function call 27 foo(t) -[kotlinOverloadAndExtensionUsages.0.kt] Function call 32 a.foo(1, "") -[kotlinOverloadAndExtensionUsages.0.kt] Function call 37 foo(t) -[kotlinOverloadAndExtensionUsages.0.kt] Function call 41 foo(s) +[kotlinOverloadAndExtensionUsages.0.kt] Function call 12 x.foo(1, 2) +[kotlinOverloadAndExtensionUsages.0.kt] Function call 26 foo(t) +[kotlinOverloadAndExtensionUsages.0.kt] Function call 31 a.foo(1, "") +[kotlinOverloadAndExtensionUsages.0.kt] Function call 36 foo(t) +[kotlinOverloadAndExtensionUsages.0.kt] Function call 40 foo(s) [kotlinOverloadAndExtensionUsages.1.kt] Function call 11 a.foo(0, "") [kotlinOverloadAndExtensionUsages.1.kt] Function call 3 super.foo(t) diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.results.txt index 56ad8f17d917..015faf116c85 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.results.txt @@ -1,3 +1,3 @@ -[kotlinPrivatePropertyUsages2.0.kt] Named argument 10 public class ServerEx() : Server(foo = "!") { -[kotlinPrivatePropertyUsages2.0.kt] Value read 7 open fun processRequest() = foo +[kotlinPrivatePropertyUsages2.0.kt] Named argument 9 public class ServerEx() : Server(foo = "!") { +[kotlinPrivatePropertyUsages2.0.kt] Value read 6 open fun processRequest() = foo [kotlinPrivatePropertyUsages2.1.kt] Named argument 5 println(Server(foo = "!").foo) diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.results.txt index 666e41f27e7d..bb0cadec4c56 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.results.txt @@ -1,3 +1,3 @@ -[kotlinPropertyReadUsages.0.kt] Value read 14 return super.foo +[kotlinPropertyReadUsages.0.kt] Value read 13 return super.foo [kotlinPropertyReadUsages.1.kt] Value read 11 println("b.foo = ${b.foo}") [kotlinPropertyReadUsages.1.kt] Value read 7 println("a.foo = ${a.foo}") \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.results.txt index ace8461ee6be..e6d395dedf52 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.results.txt @@ -1,3 +1,3 @@ -[kotlinPropertyReadUsages2.0.kt] Value read 13 return super.foo +[kotlinPropertyReadUsages2.0.kt] Value read 12 return super.foo [kotlinPropertyReadUsages2.1.kt] Value read 11 println("b.foo = ${b.foo}") [kotlinPropertyReadUsages2.1.kt] Value read 7 println("a.foo = ${a.foo}") diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.results.txt index 54f9357982b8..8b8644b40f1d 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.results.txt @@ -1,5 +1,5 @@ -[kotlinPropertyUsages.0.kt] Value read 14 return super.foo -[kotlinPropertyUsages.0.kt] Value write 18 super.foo = value +[kotlinPropertyUsages.0.kt] Value read 13 return super.foo +[kotlinPropertyUsages.0.kt] Value write 17 super.foo = value [kotlinPropertyUsages.1.kt] Value read 11 println("b.foo = ${b.foo}") [kotlinPropertyUsages.1.kt] Value read 7 println("a.foo = ${a.foo}") [kotlinPropertyUsages.1.kt] Value write 10 b.foo = "b" diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.results.txt index 79ea68733cfd..fe8708011bed 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.results.txt @@ -1,5 +1,5 @@ -[kotlinPropertyUsages2.0.kt] Value read 12 return super.foo -[kotlinPropertyUsages2.0.kt] Value write 16 super.foo = value +[kotlinPropertyUsages2.0.kt] Value read 11 return super.foo +[kotlinPropertyUsages2.0.kt] Value write 15 super.foo = value [kotlinPropertyUsages2.1.kt] Value read 11 println("b.foo = ${b.foo}") [kotlinPropertyUsages2.1.kt] Value read 7 println("a.foo = ${a.foo}") [kotlinPropertyUsages2.1.kt] Value write 10 b.foo = "b" diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.results.txt index aa2d03177448..9a63aead5e58 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.results.txt @@ -1,3 +1,3 @@ -[kotlinPropertyWriteUsages.0.kt] Value write 19 super.foo = value +[kotlinPropertyWriteUsages.0.kt] Value write 18 super.foo = value [kotlinPropertyWriteUsages.1.kt] Value write 10 b.foo = "b" [kotlinPropertyWriteUsages.1.kt] Value write 6 a.foo = "a" \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.results.txt index 5da653efe3d3..c7b2911cc897 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.results.txt @@ -1,3 +1,3 @@ -[kotlinPropertyWriteUsages2.0.kt] Value write 17 super.foo = value +[kotlinPropertyWriteUsages2.0.kt] Value write 16 super.foo = value [kotlinPropertyWriteUsages2.1.kt] Value write 10 b.foo = "b" [kotlinPropertyWriteUsages2.1.kt] Value write 6 a.foo = "a" \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.results.txt index 5dd1f09f894f..d70ade5e9230 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.results.txt @@ -1,5 +1,5 @@ -[kotlinPropertyUsages.0.kt] Value read (B) 16 return super.foo -[kotlinPropertyUsages.0.kt] Value write (B) 20 super.foo = value +[kotlinPropertyUsages.0.kt] Value read (B) 15 return super.foo +[kotlinPropertyUsages.0.kt] Value write (B) 19 super.foo = value [kotlinPropertyUsages.1.kt] Value read (Client) 11 println("b.foo = ${b.foo}") [kotlinPropertyUsages.1.kt] Value read (Client) 7 println("a.foo = ${a.foo}") [kotlinPropertyUsages.1.kt] Value write (Client) 10 b.foo = "b" diff --git a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinPropertyUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinPropertyUsages.results.txt index 04f57a58fb5d..54f9357982b8 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinPropertyUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/kotlin/internal/findPropertyUsages/kotlinPropertyUsages.results.txt @@ -1,5 +1,5 @@ -[kotlinPropertyUsages.0.kt] Value read 15 return super.foo -[kotlinPropertyUsages.0.kt] Value write 19 super.foo = value +[kotlinPropertyUsages.0.kt] Value read 14 return super.foo +[kotlinPropertyUsages.0.kt] Value write 18 super.foo = value [kotlinPropertyUsages.1.kt] Value read 11 println("b.foo = ${b.foo}") [kotlinPropertyUsages.1.kt] Value read 7 println("a.foo = ${a.foo}") [kotlinPropertyUsages.1.kt] Value write 10 b.foo = "b" diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt index d012c7b7757f..25622839307d 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/javaLibrary/LibraryMethodUsages.results.txt @@ -1 +1 @@ -Function call 11 Foo(1).bar(1) \ No newline at end of file +Function call 10 Foo(1).bar(1) diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt index 55fe107694cc..0a67a1c0c82f 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryFunctionUsages.results.txt @@ -1,4 +1,4 @@ -[LibraryFunctionUsages.0.kt] Callable reference 11 val f = ::foo -[LibraryFunctionUsages.0.kt] Function call 12 foo() +[LibraryFunctionUsages.0.kt] Callable reference 10 val f = ::foo +[LibraryFunctionUsages.0.kt] Function call 11 foo() [library.kt] Callable reference 53 val f = ::foo [library.kt] Function call 52 foo() \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt index 5dfb91e1e477..77e521b4a452 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryMemberFunctionUsages.results.txt @@ -1,5 +1,5 @@ -[LibraryMemberFunctionUsages.0.kt] Callable reference 12 val f = A::foo -[LibraryMemberFunctionUsages.0.kt] Function call 13 A().foo(1) +[LibraryMemberFunctionUsages.0.kt] Callable reference 11 val f = A::foo +[LibraryMemberFunctionUsages.0.kt] Function call 12 A().foo(1) [LibraryMemberFunctionUsages.1.java] Unclassified 11 new A().foo(1); [library.kt] Callable reference 61 val ff = A::foo [library.kt] Function call 60 a.foo(2) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt index b272b1ccc17a..9b7394e92591 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassMemberFunctionUsages.results.txt @@ -1,4 +1,4 @@ -[LibraryNestedClassMemberFunctionUsages.0.kt] Callable reference 12 val f = A.T::bar -[LibraryNestedClassMemberFunctionUsages.0.kt] Function call 13 A.T().bar(1) +[LibraryNestedClassMemberFunctionUsages.0.kt] Callable reference 11 val f = A.T::bar +[LibraryNestedClassMemberFunctionUsages.0.kt] Function call 12 A.T().bar(1) [library.kt] Callable reference 66 val fff = A.T::bar [library.kt] Function call 65 t.bar(2) \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt index 8795f301e1ac..f6835f7b3afe 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassPrimaryConstructorUsages.results.txt @@ -1,4 +1,4 @@ -[LibraryNestedClassPrimaryConstructorUsages.0.kt] New instance creation 19 val aa = A.T(1) -[LibraryNestedClassPrimaryConstructorUsages.0.kt] Supertype 15 class Y() : A.T(1) +[LibraryNestedClassPrimaryConstructorUsages.0.kt] New instance creation 18 val aa = A.T(1) +[LibraryNestedClassPrimaryConstructorUsages.0.kt] Supertype 14 class Y() : A.T(1) [library.kt] New instance creation 63 val t = A.T(1) [library.kt] Supertype 28 class V() : A.T(1) diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt index 8607253abbdb..1d4f9962dca5 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassSecondaryConstructorUsages.results.txt @@ -1,5 +1,5 @@ -[LibraryNestedClassSecondaryConstructorUsages.0.kt] New instance creation 18 val a: A.T = A.T() -[LibraryNestedClassSecondaryConstructorUsages.0.kt] Supertype 15 class Y() : A.T() +[LibraryNestedClassSecondaryConstructorUsages.0.kt] New instance creation 17 val a: A.T = A.T() +[LibraryNestedClassSecondaryConstructorUsages.0.kt] Supertype 14 class Y() : A.T() [LibraryNestedClassSecondaryConstructorUsages.1.java] New instance creation 14 A.T a = new A.T(); [LibraryNestedClassSecondaryConstructorUsages.1.java] Unclassified 10 super(); [LibraryNestedClassSecondaryConstructorUsages.1.java] Unclassified 6 public J() { diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt index 52ed6950c621..a097e8dac428 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryNestedClassUsages.results.txt @@ -1,8 +1,8 @@ -[LibraryNestedClassUsages.0.kt] Local variable declaration 18 val a: A.T = A.T() -[LibraryNestedClassUsages.0.kt] New instance creation 18 val a: A.T = A.T() -[LibraryNestedClassUsages.0.kt] New instance creation 19 val aa = A.T(1) -[LibraryNestedClassUsages.0.kt] Supertype 11 class X : A.T { -[LibraryNestedClassUsages.0.kt] Supertype 15 class Y() : A.T(1) +[LibraryNestedClassUsages.0.kt] Local variable declaration 17 val a: A.T = A.T() +[LibraryNestedClassUsages.0.kt] New instance creation 17 val a: A.T = A.T() +[LibraryNestedClassUsages.0.kt] New instance creation 18 val aa = A.T(1) +[LibraryNestedClassUsages.0.kt] Supertype 10 class X : A.T { +[LibraryNestedClassUsages.0.kt] Supertype 14 class Y() : A.T(1) [LibraryNestedClassUsages.1.java] Local variable declaration 11 A.T t = new A.T(); [LibraryNestedClassUsages.1.java] Local variable declaration 12 A.T tt = new A.T(1); [LibraryNestedClassUsages.1.java] New instance creation 11 A.T t = new A.T(); diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt index a0170b9bd548..d2085b7f763f 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryObjectUsages.results.txt @@ -1,4 +1,4 @@ -[LibraryObjectUsages.0.kt] Value read 12 val o = O +[LibraryObjectUsages.0.kt] Value read 11 val o = O [LibraryObjectUsages.1.java] Class static member access 7 O o = O.INSTANCE; [LibraryObjectUsages.1.java] Local variable declaration 7 O o = O.INSTANCE; [library.kt] Value read 55 val o = O \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt index b3512861b8ec..57ed77fe7ae0 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibraryPrimaryConstructorUsages.results.txt @@ -1,4 +1,4 @@ -[LibraryPrimaryConstructorUsages.0.kt] New instance creation 19 val aa = A(1) -[LibraryPrimaryConstructorUsages.0.kt] Supertype 15 class Y() : A(1) +[LibraryPrimaryConstructorUsages.0.kt] New instance creation 18 val aa = A(1) +[LibraryPrimaryConstructorUsages.0.kt] Supertype 14 class Y() : A(1) [library.kt] New instance creation 57 val a = A(1) [library.kt] Supertype 27 class C() : A(1) { diff --git a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt index 49ea324b9e27..a6c6d6d43183 100644 --- a/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt +++ b/plugins/kotlin/idea/tests/testData/findUsages/libraryUsages/kotlinLibrary/LibrarySecondaryConstructorUsages.results.txt @@ -1,5 +1,5 @@ -[LibrarySecondaryConstructorUsages.0.kt] New instance creation 18 val a: A = A() -[LibrarySecondaryConstructorUsages.0.kt] Supertype 15 class Y() : A() +[LibrarySecondaryConstructorUsages.0.kt] New instance creation 17 val a: A = A() +[LibrarySecondaryConstructorUsages.0.kt] Supertype 14 class Y() : A() [LibrarySecondaryConstructorUsages.1.java] New instance creation 14 A a = new A(); [LibrarySecondaryConstructorUsages.1.java] Unclassified 10 super(); [LibrarySecondaryConstructorUsages.1.java] Unclassified 6 public J() { diff --git a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/KotlinInjection.kt b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/KotlinInjection.kt index 33f59d26bb9f..5005324cc028 100644 --- a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/KotlinInjection.kt +++ b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/KotlinInjection.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL package language_injection import org.intellij.lang.annotations.Language diff --git a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/KotlinInjection.kt.highlighting b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/KotlinInjection.kt.highlighting index 247adcec5808..dd21f81ae2fd 100644 --- a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/KotlinInjection.kt.highlighting +++ b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/KotlinInjection.kt.highlighting @@ -1,6 +1,7 @@ +// FIR_IDENTICAL package language_injection import org.intellij.lang.annotations.Language @Language("kotlin") -val test = "fun test2() {}" +val test = "fun test2() {}" diff --git a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/KotlinInjection.kt.highlighting.fir b/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/KotlinInjection.kt.highlighting.fir deleted file mode 100644 index d5fdc534b43b..000000000000 --- a/plugins/kotlin/idea/tests/testData/highlighterMetaInfo/KotlinInjection.kt.highlighting.fir +++ /dev/null @@ -1,6 +0,0 @@ -package language_injection - -import org.intellij.lang.annotations.Language - -@Language("kotlin") -val test = "fun test2() {}" diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/internalInPrivateClass.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/internalInPrivateClass.kt index bbb5633a4560..9cea07d7af6c 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/internalInPrivateClass.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/internalInPrivateClass.kt @@ -1,5 +1,3 @@ private class Foo { internal fun bar() {} -} - -// IGNORE_FIR: KT-44939 \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/internalInPrivateClass.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/internalInPrivateClass.kt.after index 8e8a7f10eb81..b5f07278a940 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/internalInPrivateClass.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/internalInPrivateClass.kt.after @@ -1,5 +1,3 @@ private class Foo { fun bar() {} -} - -// IGNORE_FIR KT-44939 \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter3.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter3.kt index c6e8c53943a4..89030c386e7e 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter3.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter3.kt @@ -11,6 +11,4 @@ class C : A() { fun main() { val c = C() c.attribute = "test" -} - -// IGNORE_FIR: KT-44939 \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter3.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter3.kt.after index 895ccf5e1243..a144333e8d7c 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter3.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter3.kt.after @@ -11,6 +11,4 @@ class C : A() { fun main() { val c = C() c.attribute = "test" -} - -// IGNORE_FIR KT-44939 \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter6.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter6.kt index 43ff47d7a250..d9ed9aa9a119 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter6.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter6.kt @@ -15,6 +15,4 @@ class C : B() { fun main() { val c = C() c.attribute = "test" -} - -// IGNORE_FIR: KT-44939 \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter6.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter6.kt.after index ab3db3da5728..e9f9979fe40c 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter6.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantVisibilityModifier/publicOverrideProtectedSetter6.kt.after @@ -15,6 +15,4 @@ class C : B() { fun main() { val c = C() c.attribute = "test" -} - -// IGNORE_FIR KT-44939 \ No newline at end of file +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantWith/asInitializer.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantWith/asInitializer.kt index c32aa5e031d8..af95fb0a596c 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantWith/asInitializer.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantWith/asInitializer.kt @@ -1,5 +1,7 @@ +// PROBLEM: none // WITH_STDLIB +// See KTIJ-19621 fun test(): Int = with("") { println() return 42 -} +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantWith/asInitializer.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantWith/asInitializer.kt.after deleted file mode 100644 index 80c2d268bf74..000000000000 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/redundantWith/asInitializer.kt.after +++ /dev/null @@ -1,5 +0,0 @@ -// WITH_STDLIB -fun test(): Int { - println() - return 42 -} diff --git a/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt.after b/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt.after index 8085bea17b3a..ac11c65be404 100644 --- a/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt.after +++ b/plugins/kotlin/idea/tests/testData/intentions/convertToBlockBody/valueIsAnonymousObject3.kt.after @@ -1,3 +1,4 @@ +// IGNORE_FIR interface I1 interface I2 diff --git a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/hasAnnotation.kt b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/hasAnnotation.kt index d7d58f64984f..0a758fbc3bae 100644 --- a/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/hasAnnotation.kt +++ b/plugins/kotlin/idea/tests/testData/intentions/removeExplicitTypeArguments/hasAnnotation.kt @@ -1,5 +1,6 @@ // IS_APPLICABLE: false // WITH_STDLIB +@Target(AnnotationTarget.TYPE) annotation class Foo(val value: String) fun main() { diff --git a/plugins/kotlin/idea/tests/testData/kdoc/resolve/ExtensionFromImports.kt b/plugins/kotlin/idea/tests/testData/kdoc/resolve/ExtensionFromImports.kt index 921266dca215..779c582a23c7 100644 --- a/plugins/kotlin/idea/tests/testData/kdoc/resolve/ExtensionFromImports.kt +++ b/plugins/kotlin/idea/tests/testData/kdoc/resolve/ExtensionFromImports.kt @@ -7,4 +7,4 @@ import java.io.File fun f() { } -// REF: (for File in kotlin.io).extension +// REF: (for java.io.File in kotlin.io).extension diff --git a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jsExperimentalLibrary/lib/lib.kt b/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jsExperimentalLibrary/lib/lib.kt deleted file mode 100644 index 252262810997..000000000000 --- a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jsExperimentalLibrary/lib/lib.kt +++ /dev/null @@ -1,8 +0,0 @@ -package lib - -@RequiresOptIn -annotation class ExperimentalAPI - -class Foo - -fun bar() {} diff --git a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jsExperimentalLibrary/usage/usage.kt b/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jsExperimentalLibrary/usage/usage.kt deleted file mode 100644 index 968097b79654..000000000000 --- a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jsExperimentalLibrary/usage/usage.kt +++ /dev/null @@ -1,14 +0,0 @@ -package usage - -import lib.* - -fun fail(foo: Foo): Foo { - bar() - return foo -} - -@ExperimentalAPI -fun ok(foo: Foo): Foo { - bar() - return foo -} diff --git a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jvmExperimentalLibrary/lib/lib.kt b/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jvmExperimentalLibrary/lib/lib.kt deleted file mode 100644 index 252262810997..000000000000 --- a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jvmExperimentalLibrary/lib/lib.kt +++ /dev/null @@ -1,8 +0,0 @@ -package lib - -@RequiresOptIn -annotation class ExperimentalAPI - -class Foo - -fun bar() {} diff --git a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jvmExperimentalLibrary/usage/usage.kt b/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jvmExperimentalLibrary/usage/usage.kt deleted file mode 100644 index 968097b79654..000000000000 --- a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/jvmExperimentalLibrary/usage/usage.kt +++ /dev/null @@ -1,14 +0,0 @@ -package usage - -import lib.* - -fun fail(foo: Foo): Foo { - bar() - return foo -} - -@ExperimentalAPI -fun ok(foo: Foo): Foo { - bar() - return foo -} diff --git a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/multiplatform/jvmKotlinReferencesCommonKotlinThroughJavaDifferentJvmImpls/dependencies.txt b/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/multiplatform/jvmKotlinReferencesCommonKotlinThroughJavaDifferentJvmImpls/dependencies.txt index 7e78003fec7e..2d7c3f35d762 100644 --- a/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/multiplatform/jvmKotlinReferencesCommonKotlinThroughJavaDifferentJvmImpls/dependencies.txt +++ b/plugins/kotlin/idea/tests/testData/multiModuleHighlighting/multiplatform/jvmKotlinReferencesCommonKotlinThroughJavaDifferentJvmImpls/dependencies.txt @@ -11,5 +11,8 @@ a_jvm_id1 -> MOCK_JDK { kind=DEPENDENCY } a_jvm_id2 -> a_common { kind=DEPENDS_ON } a_jvm_id2 -> MOCK_JDK { kind=DEPENDENCY } b_jvm -> a_jvm_id2 { kind=DEPENDENCY } +b_jvm -> MOCK_JDK { kind=DEPENDENCY } c_jvm -> a_jvm_id1 { kind=DEPENDENCY } +c_jvm -> MOCK_JDK { kind=DEPENDENCY } d_jvm -> a_jvm_id1 { kind=DEPENDENCY } +d_jvm -> MOCK_JDK { kind=DEPENDENCY } diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/valueClass/jvm/IC.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/valueClass/jvm/IC.kt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/valueClass/jvm/ic.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/valueClass/jvm/IC.kt.after similarity index 100% rename from plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/valueClass/jvm/ic.kt.after rename to plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/valueClass/jvm/IC.kt.after diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/header/header.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/header/header.kt index 2a3a31a2dec0..cfce71000890 100644 --- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/header/header.kt +++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/header/header.kt @@ -1 +1,3 @@ +// "Add 'actual' modifier" "false" + expect class Foo diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/header/header.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/header/header.kt.after deleted file mode 100644 index 2a3a31a2dec0..000000000000 --- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/header/header.kt.after +++ /dev/null @@ -1 +0,0 @@ -expect class Foo diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/jvm/jvm.kt index c776d0f1aeb3..2337275946b9 100644 --- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/jvm/jvm.kt +++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/jvm/jvm.kt @@ -1,3 +1,7 @@ -// "Add 'actual' modifier" "true" +// "Add 'actual' modifier" "false" +// ACTION: Create test +// ACTION: Rename file to Foo.kt + +// KTIJ-19789 No diagnostic "actual is missing" on top-level class/function/property in IDE class Foo diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/jvm/jvm.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/jvm/jvm.kt.after deleted file mode 100644 index f19a12d17c23..000000000000 --- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToClass/jvm/jvm.kt.after +++ /dev/null @@ -1,3 +0,0 @@ -// "Add 'actual' modifier" "true" - -actual class Foo diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToTopLevelMember/header/header.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToTopLevelMember/header/header.kt.after deleted file mode 100644 index 892bde13e9cd..000000000000 --- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToTopLevelMember/header/header.kt.after +++ /dev/null @@ -1 +0,0 @@ -expect fun foo() diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToTopLevelMember/jvm/jvm.kt b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToTopLevelMember/jvm/jvm.kt index ebab4d7067b2..672a43d49495 100644 --- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToTopLevelMember/jvm/jvm.kt +++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToTopLevelMember/jvm/jvm.kt @@ -1,3 +1,6 @@ -// "Add 'actual' modifier" "true" +// "Add 'actual' modifier" "false" +// ACTION: Create test + +// KTIJ-19789 No diagnostic "actual is missing" on top-level class/function/property in IDE fun foo() {} diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToTopLevelMember/jvm/jvm.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToTopLevelMember/jvm/jvm.kt.after deleted file mode 100644 index b189c7f79102..000000000000 --- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/addActualToTopLevelMember/jvm/jvm.kt.after +++ /dev/null @@ -1,3 +0,0 @@ -// "Add 'actual' modifier" "true" - -actual fun foo() {} diff --git a/plugins/kotlin/idea/tests/testData/quickfix/addInitializer/memberExtensionPropertyVarGetterOnly.kt b/plugins/kotlin/idea/tests/testData/quickfix/addInitializer/memberExtensionPropertyVarGetterOnly.kt index 73015a2fa239..ad13f0e6f3a4 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/addInitializer/memberExtensionPropertyVarGetterOnly.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/addInitializer/memberExtensionPropertyVarGetterOnly.kt @@ -1,6 +1,6 @@ // "Add initializer" "false" // ACTION: Add setter -// ACTION: Change to val +// ACTION: Change to 'val' // ACTION: Make internal // ACTION: Make private // ACTION: Make protected diff --git a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator2.kt.after index 182ab7d75a1c..58b42f6fa58b 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator2.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/replaceWithSafeCall/invokeOperator2.kt.after @@ -9,4 +9,4 @@ class Bar { fun test(foo: Foo?) { foo?.bar?.invoke() } -/* IGNORE_FIR */c \ No newline at end of file +/* IGNORE_FIR */ \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableBinaryExpression.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableBinaryExpression.kt.after index e807a2f8ee3f..4c2bcbabd4bc 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableBinaryExpression.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/nullableBinaryExpression.kt.after @@ -6,7 +6,7 @@ interface A operator fun A?.plus(a: A?): A? = this fun test(a1: A, a2: A) { - a1 + a2?.let { notNull(it) } + (a1 + a2)?.let { notNull(it) } } fun notNull(t: A): A = t diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.kt b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.kt index 724605f84259..d35ca132740a 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.kt +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.kt @@ -1,7 +1,4 @@ // "Wrap with '?.let { ... }' call" "true" -// ERROR: Expression 'it' of type 'Unit' cannot be invoked as a function. The function 'invoke()' is not found -// ERROR: Function invocation 'foo2()' expected -// ERROR: Reference has a nullable type '(Str.() -> Unit)?', use explicit '?.invoke()' to make a function-like call instead // WITH_RUNTIME interface Str { diff --git a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.kt.after index cdbc8bc08e2f..a2d910e0a5ef 100644 --- a/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.kt.after +++ b/plugins/kotlin/idea/tests/testData/quickfix/wrapWithSafeLetCall/refactorNullableFunctionTypeProperty2.kt.after @@ -1,7 +1,4 @@ // "Wrap with '?.let { ... }' call" "true" -// ERROR: Expression 'it' of type 'Unit' cannot be invoked as a function. The function 'invoke()' is not found -// ERROR: Function invocation 'foo2()' expected -// ERROR: Reference has a nullable type '(Str.() -> Unit)?', use explicit '?.invoke()' to make a function-like call instead // WITH_RUNTIME interface Str { @@ -12,7 +9,7 @@ object Str2 { val foo2: (Str.() -> Unit)? = null fun bar(s: Str) { - s.foo2?.let { it() } + foo2?.let { s.it() } } } diff --git a/plugins/kotlin/idea/tests/testData/resolve/references/JavaParameter.kt b/plugins/kotlin/idea/tests/testData/resolve/references/JavaParameter.kt index b7a9caffe368..01e35444aa5e 100644 --- a/plugins/kotlin/idea/tests/testData/resolve/references/JavaParameter.kt +++ b/plugins/kotlin/idea/tests/testData/resolve/references/JavaParameter.kt @@ -1,6 +1,6 @@ lateinit var x: java.lang.Readable lateinit var y: java.nio.CharBuffer -val h = x.read(cb = y) +val h = x.read(p0 = y) -// REF: CharBuffer cb +// REF: CharBuffer var1 diff --git a/plugins/kotlin/idea/tests/testData/structuralsearch/countFilter/maxWhenConditionWithExpression.kt b/plugins/kotlin/idea/tests/testData/structuralsearch/countFilter/maxWhenConditionWithExpression.kt index 2bd4321c30d3..9050310d5942 100644 --- a/plugins/kotlin/idea/tests/testData/structuralsearch/countFilter/maxWhenConditionWithExpression.kt +++ b/plugins/kotlin/idea/tests/testData/structuralsearch/countFilter/maxWhenConditionWithExpression.kt @@ -10,13 +10,13 @@ fun foo(): Int { val x1 = when { else -> 1 } val x2 = when { - 1 < 2 -> 3 + 1 < 2 -> 3 else -> 1 } val x3 = when { - 1 < 3 -> 1 - 2 > 1 -> 4 + 1 < 3 -> 1 + 2 > 1 -> 4 else -> 1 } diff --git a/plugins/kotlin/jvm-debugger/test/testData/continuation/suspendFun.out b/plugins/kotlin/jvm-debugger/test/testData/continuation/suspendFun.out index e5fe8863f590..3de3e025e112 100644 --- a/plugins/kotlin/jvm-debugger/test/testData/continuation/suspendFun.out +++ b/plugins/kotlin/jvm-debugger/test/testData/continuation/suspendFun.out @@ -15,7 +15,7 @@ CoroutineInfo: -1 coroutine UNKNOWN CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$3 (kotlin.coroutines.intrinsics) ($i$a$-createCoroutineFromSuspendFunction-IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$2, it, result, this) CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) - ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$with, completion, current, param, result, this) + ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$resumeWith_u24lambda_u2d0, completion, current, param, result, this) CoroutineStackFrame startCoroutine:!LINE_NUMBER!, ContinuationKt (kotlin.coroutines) ($this$startCoroutine, completion, receiver) CoroutineStackFrame main:!LINE_NUMBER!, SuspendFunKt (coroutine1) diff --git a/plugins/kotlin/jvm-debugger/test/testData/continuation/suspendFunWithInner.out b/plugins/kotlin/jvm-debugger/test/testData/continuation/suspendFunWithInner.out index 92649d1c0855..e524c34e6000 100644 --- a/plugins/kotlin/jvm-debugger/test/testData/continuation/suspendFunWithInner.out +++ b/plugins/kotlin/jvm-debugger/test/testData/continuation/suspendFunWithInner.out @@ -13,7 +13,7 @@ CoroutineInfo: 1 coroutine RUNNING CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, SuspendFunWithInnerKt$main$1 (continuation) (rootCoroutineVal) CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) - ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$with, completion, current, param, result, this) + ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$resumeWith_u24lambda_u2d0, completion, current, param, result, this) CoroutineStackFrame run:!LINE_NUMBER!, DispatchedTask (kotlinx.coroutines) ($i$a$-withCoroutineContext-DispatchedTask$run$1, $i$f$withCoroutineContext, context, continuation, countOrElement$iv, delegate, exception, fatalException, job, oldValue$iv, state, taskContext, this) CoroutineStackFrame processNextEvent:!LINE_NUMBER!, EventLoopImplBase (kotlinx.coroutines) diff --git a/plugins/kotlin/jvm-debugger/test/testData/continuation/suspendLambda.out b/plugins/kotlin/jvm-debugger/test/testData/continuation/suspendLambda.out index 3e0b17a6199d..9bffcf870e4f 100644 --- a/plugins/kotlin/jvm-debugger/test/testData/continuation/suspendLambda.out +++ b/plugins/kotlin/jvm-debugger/test/testData/continuation/suspendLambda.out @@ -9,7 +9,7 @@ Thread stack trace: ($result, $this$sequence, step, terms, this) CoroutineInfo: -1 coroutine UNKNOWN CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) - ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$with, completion, current, param, result, this) + ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$resumeWith_u24lambda_u2d0, completion, current, param, result, this) CoroutineStackFrame hasNext:!LINE_NUMBER!, SequenceBuilderIterator (kotlin.sequences) (step, this) CoroutineStackFrame hasNext:!LINE_NUMBER!, TakeSequence$iterator$1 (kotlin.sequences) diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/frame/sourcePositionForGetterWithDiamondInterfaces.ir.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/frame/sourcePositionForGetterWithDiamondInterfaces.ir.out deleted file mode 100644 index 77cfa2e0ef94..000000000000 --- a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/frame/sourcePositionForGetterWithDiamondInterfaces.ir.out +++ /dev/null @@ -1,14 +0,0 @@ -LineBreakpoint created at sourcePositionForGetterWithDiamondInterfaces.kt:22 -Run Java -Connected to the target VM -sourcePositionForGetterWithDiamondInterfaces.kt:22 -KotlinStackFrame (sourcePositionForGetterWithDiamondInterfaces.kt:22) - JavaValue[local] instance: sourcePositionForGetterWithDiamondInterfaces.TestClass = sourcePositionForGetterWithDiamondInterfaces.TestClass@hashCode (sourcePositionForGetterWithDiamondInterfaces.kt:20) - DummyMessageValueNode = No fields to display - JavaValue[getter] i2Int: int (sourcePositionForGetterWithDiamondInterfaces.kt:8) - JavaValue[getter] i3Int: int (sourcePositionForGetterWithDiamondInterfaces.kt:12) - JavaValue[getter] i1Int: int (sourcePositionForGetterWithDiamondInterfaces.kt:4) -Disconnected from the target VM - -Process finished with exit code 0 - diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/kt22366.kt b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/kt22366.kt index 2fa166e173fd..8b0e00d8991d 100644 --- a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/kt22366.kt +++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/kt22366.kt @@ -3,7 +3,7 @@ package kt22366 fun main(args: Array) { val yy = (0 .. 10).map { a -> //Breakpoint! (lambdaOrdinal = -1) - (0 .. 10).map { b -> b }.max() + (0 .. 10).map { b -> b }.maxOrNull() } } diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/lambdas/inlineFunctionalExpression.ir.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/lambdas/inlineFunctionalExpression.ir.out deleted file mode 100644 index 8bea5b0559e5..000000000000 --- a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/lambdas/inlineFunctionalExpression.ir.out +++ /dev/null @@ -1,7 +0,0 @@ -LineBreakpoint created at inlineFunctionalExpression.kt:9 -Run Java -Connected to the target VM -inlineFunctionalExpression.kt:9 -Disconnected from the target VM - -Process finished with exit code 0 diff --git a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/lambdas/inlineFunctionalExpression.out b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/lambdas/inlineFunctionalExpression.out index 14232d4d159e..31c9fc3633bb 100644 --- a/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/lambdas/inlineFunctionalExpression.out +++ b/plugins/kotlin/jvm-debugger/test/testData/evaluation/singleBreakpoint/lambdas/inlineFunctionalExpression.out @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: JVM_WITH_IR_EVALUATOR +// IGNORE_BACKEND: JVM_WITH_IR_EVALUATOR, JVM_IR_WITH_IR_EVALUATOR LineBreakpoint created at inlineFunctionalExpression.kt:9 Run Java Connected to the target VM diff --git a/plugins/kotlin/jvm-debugger/test/testData/xcoroutines/coroutineSuspendFun.out b/plugins/kotlin/jvm-debugger/test/testData/xcoroutines/coroutineSuspendFun.out index d9189b5c4eec..8a1eac999c3f 100644 --- a/plugins/kotlin/jvm-debugger/test/testData/xcoroutines/coroutineSuspendFun.out +++ b/plugins/kotlin/jvm-debugger/test/testData/xcoroutines/coroutineSuspendFun.out @@ -13,7 +13,7 @@ CoroutineInfo: 1 coroutine RUNNING CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, CoroutineSuspendFunKt$main$1 (continuation) ($completion, c, paramB) CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) - ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$with, completion, current, param, result, this) + ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$resumeWith_u24lambda_u2d0, completion, current, param, result, this) CoroutineStackFrame run:!LINE_NUMBER!, DispatchedTask (kotlinx.coroutines) ($i$a$-withCoroutineContext-DispatchedTask$run$1, $i$f$withCoroutineContext, context, continuation, countOrElement$iv, delegate, exception, fatalException, job, oldValue$iv, state, taskContext, this) CoroutineStackFrame processNextEvent:!LINE_NUMBER!, EventLoopImplBase (kotlinx.coroutines) diff --git a/plugins/kotlin/jvm-debugger/test/testData/xcoroutines/coroutineSuspendFun136.out b/plugins/kotlin/jvm-debugger/test/testData/xcoroutines/coroutineSuspendFun136.out index c9cb23a692ef..07833ce0d2c1 100644 --- a/plugins/kotlin/jvm-debugger/test/testData/xcoroutines/coroutineSuspendFun136.out +++ b/plugins/kotlin/jvm-debugger/test/testData/xcoroutines/coroutineSuspendFun136.out @@ -13,7 +13,7 @@ CoroutineInfo: 1 coroutine RUNNING CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, CoroutineSuspendFun136Kt$main$1 (continuation) ($completion, c, paramB) CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) - ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$with, completion, current, param, result, this) + ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$resumeWith_u24lambda_u2d0, completion, current, param, result, this) CoroutineStackFrame run:!LINE_NUMBER!, DispatchedTask (kotlinx.coroutines) ($i$a$-withCoroutineContext-DispatchedTask$run$1, $i$f$withCoroutineContext, context, continuation, countOrElement$iv, delegate, exception, fatalException, job, oldValue$iv, state, taskContext, this) CoroutineStackFrame processNextEvent:!LINE_NUMBER!, EventLoopImplBase (kotlinx.coroutines) diff --git a/plugins/kotlin/jvm-debugger/test/testData/xcoroutines/suspendMain.out b/plugins/kotlin/jvm-debugger/test/testData/xcoroutines/suspendMain.out index f1a200b7f33c..af60b8872544 100644 --- a/plugins/kotlin/jvm-debugger/test/testData/xcoroutines/suspendMain.out +++ b/plugins/kotlin/jvm-debugger/test/testData/xcoroutines/suspendMain.out @@ -15,7 +15,7 @@ CoroutineInfo: -1 coroutine UNKNOWN CoroutineStackFrame invokeSuspend:!LINE_NUMBER!, IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$$inlined$createCoroutineFromSuspendFunction$IntrinsicsKt__IntrinsicsJvmKt$1 (kotlin.coroutines.intrinsics) ($i$a$-createCoroutineFromSuspendFunction-IntrinsicsKt__IntrinsicsJvmKt$createCoroutineUnintercepted$1, it, result, this) CoroutineStackFrame resumeWith:!LINE_NUMBER!, BaseContinuationImpl (kotlin.coroutines.jvm.internal) - ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$with, completion, current, param, result, this) + ($i$a$-with-BaseContinuationImpl$resumeWith$1, $this$resumeWith_u24lambda_u2d0, completion, current, param, result, this) CoroutineStackFrame startCoroutine:!LINE_NUMBER!, ContinuationKt (kotlin.coroutines) ($this$startCoroutine, completion) CoroutineStackFrame runSuspend:!LINE_NUMBER!, RunSuspendKt (kotlin.coroutines.jvm.internal) diff --git a/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle b/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle index 72689e7806b5..59e6d776e0e7 100644 --- a/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle +++ b/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION') - classpath('com.android.tools.build:gradle:4.0.2') + classpath('com.android.tools.build:gradle:4.1.2') } } diff --git a/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle.kts b/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle.kts index 371b353bb222..05f78d637036 100644 --- a/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle.kts +++ b/plugins/kotlin/project-wizard/cli/testData/buildFileGeneration/android/expected/build.gradle.kts @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION") - classpath("com.android.tools.build:gradle:4.0.2") + classpath("com.android.tools.build:gradle:4.1.2") } } diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts index f64aac98b027..4d58b5e18c44 100644 --- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts +++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts @@ -6,8 +6,8 @@ buildscript { mavenCentral() } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION") - classpath("com.android.tools.build:gradle:4.0.2") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21") + classpath("com.android.tools.build:gradle:4.1.2") } } diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle index 2be3790cde25..0e94052b0e60 100644 --- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle +++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle @@ -9,6 +9,7 @@ version = '1.0-SNAPSHOT' repositories { jcenter() mavenCentral() + maven { url 'https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven' } } kotlin { @@ -40,8 +41,8 @@ kotlin { } jvmMain { dependencies { - implementation 'io.ktor:ktor-server-netty:1.5.2' - implementation 'io.ktor:ktor-html-builder:1.5.2' + implementation 'io.ktor:ktor-server-netty:1.6.3' + implementation 'io.ktor:ktor-html-builder:1.6.3' implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2' } } @@ -50,8 +51,8 @@ kotlin { } jsMain { dependencies { - implementation 'org.jetbrains.kotlin-wrappers:kotlin-react:17.0.2-pre.206-kotlin-1.5.10' - implementation 'org.jetbrains.kotlin-wrappers:kotlin-react-dom:17.0.2-pre.206-kotlin-1.5.10' + implementation 'org.jetbrains.kotlin-wrappers:kotlin-react:17.0.2-pre.240-kotlin-1.5.30' + implementation 'org.jetbrains.kotlin-wrappers:kotlin-react-dom:17.0.2-pre.240-kotlin-1.5.30' } } jsTest { diff --git a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts index 631a01fc1e9e..3acdf1e3ae54 100644 --- a/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts +++ b/plugins/kotlin/project-wizard/cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts @@ -9,6 +9,7 @@ version = "1.0-SNAPSHOT" repositories { jcenter() mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") } kotlin { @@ -38,16 +39,16 @@ kotlin { } val jvmMain by getting { dependencies { - implementation("io.ktor:ktor-server-netty:1.5.2") - implementation("io.ktor:ktor-html-builder:1.5.2") + implementation("io.ktor:ktor-server-netty:1.6.3") + implementation("io.ktor:ktor-html-builder:1.6.3") implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2") } } val jvmTest by getting val jsMain by getting { dependencies { - implementation("org.jetbrains.kotlin-wrappers:kotlin-react:17.0.2-pre.206-kotlin-1.5.10") - implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:17.0.2-pre.206-kotlin-1.5.10") + implementation("org.jetbrains.kotlin-wrappers:kotlin-react:17.0.2-pre.240-kotlin-1.5.30") + implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:17.0.2-pre.240-kotlin-1.5.30") } } val jsTest by getting diff --git a/plugins/kotlin/uast/uast-kotlin/tests/testData/Regex.compiled.log b/plugins/kotlin/uast/uast-kotlin/tests/testData/Regex.compiled.log index 8a7124d62d4c..c965ef4d2e76 100644 --- a/plugins/kotlin/uast/uast-kotlin/tests/testData/Regex.compiled.log +++ b/plugins/kotlin/uast/uast-kotlin/tests/testData/Regex.compiled.log @@ -1,10 +1,38 @@ UClass (name = Regex) - UField (name = _options) - UAnnotation (fqName = org.jetbrains.annotations.Nullable) - UField (name = nativePattern) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) UField (name = Companion) UAnnotation (fqName = null) + UField (name = nativePattern) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UField (name = _options) + UAnnotation (fqName = org.jetbrains.annotations.Nullable) + UMethod (name = Regex) + UParameter (name = nativePattern) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UMethod (name = Regex) + UParameter (name = pattern) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UBlockExpression + UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) + UIdentifier (Identifier ()) + USimpleNameReferenceExpression (identifier = , resolvesTo = null) + UMethod (name = Regex) + UParameter (name = pattern) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UParameter (name = option) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UBlockExpression + UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) + UIdentifier (Identifier ()) + USimpleNameReferenceExpression (identifier = , resolvesTo = null) + UMethod (name = Regex) + UParameter (name = pattern) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UParameter (name = options) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UBlockExpression + UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) + UIdentifier (Identifier ()) + USimpleNameReferenceExpression (identifier = , resolvesTo = null) UMethod (name = getPattern) UMethod (name = getOptions) UMethod (name = matches) @@ -62,59 +90,37 @@ UClass (name = Regex) UAnnotation (fqName = org.jetbrains.annotations.NotNull) UParameter (name = limit) UBlockExpression + UMethod (name = splitToSequence) + UParameter (name = input) + UAnnotation (fqName = org.jetbrains.annotations.NotNull) + UParameter (name = limit) + UBlockExpression UMethod (name = toString) UBlockExpression UMethod (name = toPattern) UBlockExpression UMethod (name = writeReplace) UBlockExpression - UMethod (name = Regex) - UParameter (name = nativePattern) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UMethod (name = Regex) - UParameter (name = pattern) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier ()) - USimpleNameReferenceExpression (identifier = , resolvesTo = null) - UMethod (name = Regex) - UParameter (name = pattern) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UParameter (name = option) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier ()) - USimpleNameReferenceExpression (identifier = , resolvesTo = null) - UMethod (name = Regex) - UParameter (name = pattern) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UParameter (name = options) - UAnnotation (fqName = org.jetbrains.annotations.NotNull) - UBlockExpression - UCallExpression (kind = UastCallKind(name='method_call'), argCount = 0)) - UIdentifier (Identifier ()) - USimpleNameReferenceExpression (identifier = , resolvesTo = null) UClass (name = Serialized) + UField (name = Companion) + UAnnotation (fqName = null) UField (name = pattern) UAnnotation (fqName = org.jetbrains.annotations.NotNull) UField (name = flags) UAnnotation (fqName = org.jetbrains.annotations.NotNull) UField (name = serialVersionUID) - UField (name = Companion) - UAnnotation (fqName = null) - UMethod (name = readResolve) - UBlockExpression - UMethod (name = getPattern) - UMethod (name = getFlags) UMethod (name = Serialized) UParameter (name = pattern) UAnnotation (fqName = org.jetbrains.annotations.NotNull) UParameter (name = flags) + UMethod (name = getPattern) + UMethod (name = getFlags) + UMethod (name = readResolve) + UBlockExpression UClass (name = Companion) UMethod (name = Companion) UClass (name = Companion) + UMethod (name = Companion) UMethod (name = fromLiteral) UParameter (name = literal) UAnnotation (fqName = org.jetbrains.annotations.NotNull) @@ -130,4 +136,3 @@ UClass (name = Regex) UMethod (name = ensureUnicodeCase) UParameter (name = flags) UBlockExpression - UMethod (name = Companion)