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

Renames

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-11-23 20:30:59 +03:00
parent fc34557a7a
commit 4905275a30
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt
+5 -5
View File
@@ -39,16 +39,16 @@ class SuggestVariableNameMacro : Macro() {
override fun getPresentableName() = "kotlinSuggestVariableName()" override fun getPresentableName() = "kotlinSuggestVariableName()"
override fun calculateResult(params: Array<out Expression>, context: ExpressionContext): Result? { override fun calculateResult(params: Array<out Expression>, context: ExpressionContext): Result? {
return nameSuggestions(context).firstOrNull()?.let { TextResult(it) } return suggestNames(context).firstOrNull()?.let { TextResult(it) }
} }
override fun calculateLookupItems(params: Array<out Expression>, context: ExpressionContext): Array<out LookupElement>? { override fun calculateLookupItems(params: Array<out Expression>, context: ExpressionContext): Array<out LookupElement>? {
val suggestions = nameSuggestions(context) val suggestions = suggestNames(context)
if (suggestions.size < 2) return null if (suggestions.size < 2) return null
return suggestions.map { LookupElementBuilder.create(it) }.toTypedArray() return suggestions.map { LookupElementBuilder.create(it) }.toTypedArray()
} }
private fun nameSuggestions(context: ExpressionContext): Collection<String> { private fun suggestNames(context: ExpressionContext): Collection<String> {
val project = context.project val project = context.project
val psiDocumentManager = PsiDocumentManager.getInstance(project) val psiDocumentManager = PsiDocumentManager.getInstance(project)
psiDocumentManager.commitAllDocuments() psiDocumentManager.commitAllDocuments()
@@ -68,14 +68,14 @@ class SuggestVariableNameMacro : Macro() {
val parent = declaration.parent val parent = declaration.parent
if (parent is KtForExpression && declaration == parent.loopParameter) { if (parent is KtForExpression && declaration == parent.loopParameter) {
iterationVariableNameSuggestions(parent, nameValidator)?.let { return it } suggestIterationVariableName(parent, nameValidator)?.let { return it }
} }
val descriptor = declaration.resolveToDescriptor() as? VariableDescriptor ?: return emptyList() val descriptor = declaration.resolveToDescriptor() as? VariableDescriptor ?: return emptyList()
return KotlinNameSuggester.suggestNamesByType(descriptor.type, nameValidator, null) return KotlinNameSuggester.suggestNamesByType(descriptor.type, nameValidator, null)
} }
private fun iterationVariableNameSuggestions(forExpression: KtForExpression, nameValidator: (String) -> Boolean): Collection<String>? { private fun suggestIterationVariableName(forExpression: KtForExpression, nameValidator: (String) -> Boolean): Collection<String>? {
val loopRange = forExpression.loopRange ?: return null val loopRange = forExpression.loopRange ?: return null
val resolutionFacade = forExpression.getResolutionFacade() val resolutionFacade = forExpression.getResolutionFacade()
val bindingContext = resolutionFacade.analyze(loopRange, BodyResolveMode.PARTIAL) val bindingContext = resolutionFacade.analyze(loopRange, BodyResolveMode.PARTIAL)