diff options
author | Matthew Gharrity <gharrma@google.com> | 2022-05-06 20:12:49 +0000 |
---|---|---|
committer | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-06-28 22:03:31 +0000 |
commit | ba534bdd25065630ebff363f1949f06ed44ef9c1 (patch) | |
tree | 1c8755b60ec6dc72910e3477d2929ed4346097a2 /compose-ide-plugin | |
parent | 601f88fa1dca7c5f035e01d806effa8fe689fe0f (diff) | |
download | idea-ba534bdd25065630ebff363f1949f06ed44ef9c1.tar.gz |
Integrate Kotlin IDE plugin 1.7.0
Bug: 231736664
Change-Id: Ieb596404ea79a3c80f557e6fd1cf15f5a6d06453
Diffstat (limited to 'compose-ide-plugin')
-rw-r--r-- | compose-ide-plugin/testSrc/com/android/tools/compose/ComposableDeclarationCheckerTest.kt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compose-ide-plugin/testSrc/com/android/tools/compose/ComposableDeclarationCheckerTest.kt b/compose-ide-plugin/testSrc/com/android/tools/compose/ComposableDeclarationCheckerTest.kt index 067b0219fcb..cef32e57809 100644 --- a/compose-ide-plugin/testSrc/com/android/tools/compose/ComposableDeclarationCheckerTest.kt +++ b/compose-ide-plugin/testSrc/com/android/tools/compose/ComposableDeclarationCheckerTest.kt @@ -160,7 +160,7 @@ class ComposableDeclarationCheckerTest : JavaCodeInsightFixtureTestCase() { object FakeFoo : Foo { <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open fun composableFunction(param: Boolean): Boolean defined in com.example.FakeFoo, @Composable public abstract fun composableFunction(param: Boolean): Boolean defined in com.example.Foo">override fun composableFunction(param: Boolean)</error> = true <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: @Composable public open fun nonComposableFunction(param: Boolean): Boolean defined in com.example.FakeFoo, public abstract fun nonComposableFunction(param: Boolean): Boolean defined in com.example.Foo">@Composable override fun nonComposableFunction(param: Boolean)</error> = true - <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open val nonComposableProperty: Boolean defined in com.example.FakeFoo, public abstract val nonComposableProperty: Boolean defined in com.example.Foo">override val nonComposableProperty: Boolean</error> <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: @Composable public open fun <get-nonComposableProperty>(): Boolean defined in com.example.FakeFoo, public abstract fun <get-nonComposableProperty>(): Boolean defined in com.example.Foo">@Composable get()</error> = true + <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open val nonComposableProperty: Boolean defined in com.example.FakeFoo, public abstract val nonComposableProperty: Boolean defined in com.example.Foo">override val nonComposableProperty: Boolean</error> <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: @Composable public open fun `<get-nonComposableProperty>`(): Boolean defined in com.example.FakeFoo, public abstract fun `<get-nonComposableProperty>`(): Boolean defined in com.example.Foo">@Composable get()</error> = true } interface Bar { @@ -173,10 +173,11 @@ class ComposableDeclarationCheckerTest : JavaCodeInsightFixtureTestCase() { object FakeBar : Bar { <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open fun composableFunction(param: Boolean): Boolean defined in com.example.FakeBar, @Composable public abstract fun composableFunction(param: Boolean): Boolean defined in com.example.Bar">override fun composableFunction(param: Boolean)</error> = true - <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open val composableProperty: Boolean defined in com.example.FakeBar, public abstract val composableProperty: Boolean defined in com.example.Bar">override val composableProperty: Boolean</error> <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open fun <get-composableProperty>(): Boolean defined in com.example.FakeBar, @Composable public abstract fun <get-composableProperty>(): Boolean defined in com.example.Bar">get()</error> = true + <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open val composableProperty: Boolean defined in com.example.FakeBar, public abstract val composableProperty: Boolean defined in com.example.Bar">override val composableProperty: Boolean</error> <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open fun `<get-composableProperty>`(): Boolean defined in com.example.FakeBar, @Composable public abstract fun `<get-composableProperty>`(): Boolean defined in com.example.Bar">get()</error> = true <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: @Composable public open fun nonComposableFunction(param: Boolean): Boolean defined in com.example.FakeBar, public abstract fun nonComposableFunction(param: Boolean): Boolean defined in com.example.Bar">@Composable override fun nonComposableFunction(param: Boolean)</error> = true - <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open val nonComposableProperty: Boolean defined in com.example.FakeBar, public abstract val nonComposableProperty: Boolean defined in com.example.Bar">override val nonComposableProperty: Boolean</error> <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: @Composable public open fun <get-nonComposableProperty>(): Boolean defined in com.example.FakeBar, public abstract fun <get-nonComposableProperty>(): Boolean defined in com.example.Bar">@Composable get()</error> = true + <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: public open val nonComposableProperty: Boolean defined in com.example.FakeBar, public abstract val nonComposableProperty: Boolean defined in com.example.Bar">override val nonComposableProperty: Boolean</error> <error descr="[CONFLICTING_OVERLOADS] Conflicting overloads: @Composable public open fun `<get-nonComposableProperty>`(): Boolean defined in com.example.FakeBar, public abstract fun `<get-nonComposableProperty>`(): Boolean defined in com.example.Bar">@Composable get()</error> = true } + """ ) } |