forked from square/dagger
-
Notifications
You must be signed in to change notification settings - Fork 2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow kotlin source to use java keywords as parameter names in KSP.
Using keywords as parameter names has been working with KAPT because KAPT just renames the parameters to something that is valid Java in the generated Java stubs. However, in order to support this in KSP we need to switch over to use `XExecutableParameterElement#jvmName` rather than `XExecutableParameterElement#name`. This CL also requires updates from XProcessing, so I've updated Dagger's XProcessing jars as well. Fixes #3995: Allow kotlin source to use java keywords as parameter names in KSP RELNOTES=Fixed #3995: Allow kotlin source to use java keywords as parameter names in KSP PiperOrigin-RevId: 557565286
- Loading branch information
Showing
13 changed files
with
196 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
69 changes: 69 additions & 0 deletions
69
javatests/dagger/functional/kotlinsrc/assisted/AssistedFactoryWithJavaKeyWordNamesTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| /* | ||
| * Copyright (C) 2023 The Dagger Authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package dagger.functional.kotlinsrc.assisted | ||
|
|
||
| import com.google.common.truth.Truth.assertThat | ||
| import dagger.BindsInstance | ||
| import dagger.Component | ||
| import dagger.assisted.Assisted | ||
| import dagger.assisted.AssistedFactory | ||
| import dagger.assisted.AssistedInject | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.junit.runners.JUnit4 | ||
|
|
||
| // Regression test for https://github.com/google/dagger/issues/3995. | ||
| @RunWith(JUnit4::class) | ||
| internal class AssistedFactoryWithJavaKeyWordNamesTest { | ||
| @Component | ||
| interface MyComponent { | ||
| fun myAssistedFactory(): MyAssistedFactory | ||
|
|
||
| @Component.Builder | ||
| interface Builder { | ||
| @BindsInstance fun addInteger(int: Int): Builder | ||
| fun build(): MyComponent | ||
| } | ||
| } | ||
|
|
||
| data class MyAssistedClass @AssistedInject constructor( | ||
| val int: Int, | ||
| @Assisted val string: String, | ||
| @Assisted val long: Long | ||
| ) | ||
|
|
||
| @AssistedFactory | ||
| interface MyAssistedFactory { | ||
| fun create(long: Long, string: String): MyAssistedClass | ||
| } | ||
|
|
||
| @Test | ||
| fun testParametersWithJavaKeywordNames() { | ||
| val int = 1 | ||
| val long = 2L | ||
| val string = "string" | ||
| val myAssistedFactory = | ||
| DaggerAssistedFactoryWithJavaKeyWordNamesTest_MyComponent.builder() | ||
| .addInteger(int) | ||
| .build() | ||
| .myAssistedFactory() | ||
| .create(long, string) | ||
| assertThat(myAssistedFactory.int).isEqualTo(int) | ||
| assertThat(myAssistedFactory.long).isEqualTo(long) | ||
| assertThat(myAssistedFactory.string).isEqualTo(string) | ||
| } | ||
| } |
Oops, something went wrong.