azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix suggested names in Spring (do not take same parameter into account)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-11-30 16:38:32 +03:00
parent b09465ca0b
commit 20b48ab90c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateAutowiredDependenciesUtils.kt
+1 -1
View File
@@ -92,7 +92,7 @@ private fun addCreatePropertyTemplate(
builder.appendVariableTemplate(currentProperty, candidateBeanClasses) { builder.appendVariableTemplate(currentProperty, candidateBeanClasses) {
val existingNames = currentProperty.containingClassOrObject!!.declarations val existingNames = currentProperty.containingClassOrObject!!.declarations
.mapNotNull { if (it != currentProperty) (it as? KtProperty)?.name else null } .mapNotNull { if (it != currentProperty) (it as? KtProperty)?.name else null }
getSuggestedNames(candidateBean, currentProperty, existingNames) { returnType } getSuggestedNames(candidateBean, currentProperty, existingNames = existingNames) { returnType }
} }
builder.buildInlineTemplate() builder.buildInlineTemplate()
} }
ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt
+5 -2
View File
@@ -180,13 +180,14 @@ private fun createSettable(
internal fun getSuggestedNames( internal fun getSuggestedNames(
beanPointer: SpringBeanPointer<CommonSpringBean>, beanPointer: SpringBeanPointer<CommonSpringBean>,
declaration: KtCallableDeclaration, declaration: KtCallableDeclaration,
excludedInValidator: List<KtDeclaration> = listOf(declaration),
existingNames: Collection<String> = emptyList(), existingNames: Collection<String> = emptyList(),
getType: CallableDescriptor.() -> KotlinType? getType: CallableDescriptor.() -> KotlinType?
): Collection<String> { ): Collection<String> {
val names = LinkedHashSet<String>() val names = LinkedHashSet<String>()
val newDeclarationNameValidator = val newDeclarationNameValidator =
NewDeclarationNameValidator(declaration.parent, null, NewDeclarationNameValidator.Target.VARIABLES, listOf(declaration)) NewDeclarationNameValidator(declaration.parent, null, NewDeclarationNameValidator.Target.VARIABLES, excludedInValidator)
fun validate(name: String) = name !in existingNames && newDeclarationNameValidator(name) fun validate(name: String) = name !in existingNames && newDeclarationNameValidator(name)
SpringBeanUtils.getInstance() SpringBeanUtils.getInstance()
@@ -252,7 +253,9 @@ private fun BatchTemplateRunner.addCreateFunctionTemplate(
addTemplateFactory(parameterList) { addTemplateFactory(parameterList) {
for ((paramIndex, candidateBeanClassesForParam) in candidateBeanClasses) { for ((paramIndex, candidateBeanClassesForParam) in candidateBeanClasses) {
builder.appendVariableTemplate(function.valueParameters[paramIndex], candidateBeanClassesForParam) { builder.appendVariableTemplate(function.valueParameters[paramIndex], candidateBeanClassesForParam) {
getSuggestedNames(dependency, function) { valueParameters[paramIndex].type } getSuggestedNames(dependency, function, listOf(function.valueParameters[paramIndex], function)) {
valueParameters[paramIndex].type
}
} }
} }