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

KotlinUnusedImportInspection: reformat

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-01-18 15:18:28 +03:00
parent c54dd6385c
commit dade8deea6
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt
+18 -18
View File
@@ -44,7 +44,6 @@ import com.intellij.psi.PsiWhiteSpace
import com.intellij.psi.util.PsiUtilBase import com.intellij.psi.util.PsiUtilBase
import com.intellij.util.DocumentUtil import com.intellij.util.DocumentUtil
import org.jetbrains.kotlin.idea.core.targetDescriptors import org.jetbrains.kotlin.idea.core.targetDescriptors
import org.jetbrains.kotlin.idea.editor.fixers.end
import org.jetbrains.kotlin.idea.imports.KotlinImportOptimizer import org.jetbrains.kotlin.idea.imports.KotlinImportOptimizer
import org.jetbrains.kotlin.idea.imports.OptimizedImportsBuilder import org.jetbrains.kotlin.idea.imports.OptimizedImportsBuilder
import org.jetbrains.kotlin.idea.imports.importableFqName import org.jetbrains.kotlin.idea.imports.importableFqName
@@ -58,10 +57,7 @@ import org.jetbrains.kotlin.resolve.ImportPath
import java.util.* import java.util.*
class KotlinUnusedImportInspection : AbstractKotlinInspection() { class KotlinUnusedImportInspection : AbstractKotlinInspection() {
data class ImportData( data class ImportData(val unusedImports: List<KtImportDirective>, val optimizerData: OptimizedImportsBuilder.InputData)
val unusedImports: List<KtImportDirective>,
val optimizerData: OptimizedImportsBuilder.InputData
)
companion object { companion object {
fun analyzeImports(file: KtFile): ImportData? { fun analyzeImports(file: KtFile): ImportData? {
@@ -73,11 +69,11 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() {
val directives = file.importDirectives val directives = file.importDirectives
val explicitlyImportedFqNames = directives val explicitlyImportedFqNames = directives
.asSequence() .asSequence()
.mapNotNull { it.importPath } .mapNotNull { it.importPath }
.filter { !it.isAllUnder && !it.hasAlias() } .filter { !it.isAllUnder && !it.hasAlias() }
.map { it.fqName } .map { it.fqName }
.toSet() .toSet()
val fqNames = HashSet<FqName>() val fqNames = HashSet<FqName>()
val parentFqNames = HashSet<FqName>() val parentFqNames = HashSet<FqName>()
@@ -128,11 +124,13 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() {
if (!CodeInsightWorkspaceSettings.getInstance(file.project).optimizeImportsOnTheFly) { if (!CodeInsightWorkspaceSettings.getInstance(file.project).optimizeImportsOnTheFly) {
fixes.add(EnableOptimizeImportsOnTheFlyFix(file)) fixes.add(EnableOptimizeImportsOnTheFlyFix(file))
} }
manager.createProblemDescriptor(it, manager.createProblemDescriptor(
"Unused import directive", it,
isOnTheFly, "Unused import directive",
fixes.toTypedArray(), isOnTheFly,
ProblemHighlightType.LIKE_UNUSED_SYMBOL) fixes.toTypedArray(),
ProblemHighlightType.LIKE_UNUSED_SYMBOL
)
} }
if (isOnTheFly) { if (isOnTheFly) {
@@ -202,8 +200,7 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() {
if (!importsRange.containsRange(highlightInfo.startOffset, highlightInfo.endOffset)) { if (!importsRange.containsRange(highlightInfo.startOffset, highlightInfo.endOffset)) {
hasErrors = true hasErrors = true
false false
} } else {
else {
true true
} }
}) })
@@ -237,7 +234,10 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() {
override fun applyFix(project: Project, descriptor: ProblemDescriptor) { override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
CodeInsightWorkspaceSettings.getInstance(project).optimizeImportsOnTheFly = true CodeInsightWorkspaceSettings.getInstance(project).optimizeImportsOnTheFly = true
OptimizeImportsProcessor(project, file).run() // we optimize imports manually because on-the-fly import optimization won't work while the caret is in imports OptimizeImportsProcessor(
project,
file
).run() // we optimize imports manually because on-the-fly import optimization won't work while the caret is in imports
} }
} }
} }