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

Cleanup FqNamesUtil.kt

Browse Source 
Delete unused, move some utilities to fqNameUtil.kt in IDE, rewrite comments
This commit is contained in:
Alexander Udalov
2015-02-09 20:22:32 +03:00
parent 9b28e19551
commit 1e8d8d0a99
7 changed files with 45 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/refactoring/fqName/fqNameUtil.kt
+15
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.psi.JetElement
import org.jetbrains.kotlin.psi.JetCallExpression
import org.jetbrains.kotlin.psi.JetUserType
import org.jetbrains.kotlin.psi
import org.jetbrains.kotlin.resolve.ImportPath
/**
* Returns FqName for given declaration (either Java or Kotlin)
@@ -74,3 +75,17 @@ fun JetSimpleNameExpression.changeQualifiedName(fqName: FqName): JetElement {
else -> elementToReplace.replace(psiFactory.createExpression(text))
} as JetElement
}
public fun FqName.isImported(importPath: ImportPath, skipAliasedImports: Boolean = true): Boolean {
return when {
skipAliasedImports && importPath.hasAlias() -> false
importPath.isAllUnder() && !isRoot() -> importPath.fqnPart() == this.parent()
else -> importPath.fqnPart() == this
}
}
public fun ImportPath.isImported(alreadyImported: ImportPath): Boolean {
return if (isAllUnder() || hasAlias()) this == alreadyImported else fqnPart().isImported(alreadyImported)
}
public fun ImportPath.isImported(imports: Iterable<ImportPath>): Boolean = imports.any { isImported(it) }
idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
+1
View File
@@ -29,6 +29,7 @@ import java.util.HashSet
import java.util.ArrayList
import org.jetbrains.kotlin.idea.util.ImportInsertHelper
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import org.jetbrains.kotlin.idea.refactoring.fqName.isImported
public class KotlinImportOptimizer() : ImportOptimizer {
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetNamedDeclaration
import org.jetbrains.kotlin.idea.codeInsight.DescriptorToDeclarationUtil
import org.jetbrains.kotlin.psi.psiUtil.isAncestor
import java.util.Collections
import org.jetbrains.kotlin.name.isImported
import org.jetbrains.kotlin.idea.refactoring.fqName.isImported
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.PackageViewDescriptor
idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
+1
View File
@@ -54,6 +54,7 @@ import com.intellij.openapi.project.Project
import org.jetbrains.kotlin.idea.util.ImportInsertHelper
import org.jetbrains.kotlin.idea.util.ImportInsertHelper.ImportDescriptorResult
import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.idea.refactoring.fqName.isImported
public class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper() {
/**