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

Provide import alias suggestion for Companion

Browse Source 
Fixed #EA-223797
This commit is contained in:
Vladimir Dolzhenko
2020-02-19 15:22:22 +01:00
parent 3ec2095c9f
commit acc4118903
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceImportAlias/KotlinIntroduceImportAliasHandler.kt
+8 -1
View File
@@ -40,6 +40,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier
import org.jetbrains.kotlin.resolve.scopes.utils.findPackage import org.jetbrains.kotlin.resolve.scopes.utils.findPackage
import org.jetbrains.kotlin.utils.addToStdlib.safeAs import org.jetbrains.kotlin.utils.addToStdlib.safeAs
import org.jetbrains.kotlin.utils.checkWithAttachment
object KotlinIntroduceImportAliasHandler : RefactoringActionHandler { object KotlinIntroduceImportAliasHandler : RefactoringActionHandler {
const val REFACTORING_NAME = "Introduce Import Alias" const val REFACTORING_NAME = "Introduce Import Alias"
@@ -83,7 +84,13 @@ object KotlinIntroduceImportAliasHandler : RefactoringActionHandler {
} }
} }
val suggestionsName = KotlinNameSuggester.suggestNamesByFqName(fqName, validator = validator) val suggestionsName = KotlinNameSuggester.suggestNamesByFqName(
fqName,
validator = validator,
defaultName = { fqName.asString().replace('.', '_') })
checkWithAttachment(suggestionsName.isNotEmpty(), { "Unable to build any suggestion name for $fqName" }) {
it.withAttachment("file.kt", file.text)
}
val newName = suggestionsName.first() val newName = suggestionsName.first()
suggestedImportAliasNames = suggestionsName suggestedImportAliasNames = suggestionsName
val newDirective = ImportInsertHelperImpl.addImport(project, file, fqName, false, Name.identifier(newName)) val newDirective = ImportInsertHelperImpl.addImport(project, file, fqName, false, Name.identifier(newName))