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

Move getImportPath and related utils from JetPsiUtil to JetImportDirective

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-04-14 19:54:11 +04:00
parent c8d2bda880
commit 409f677559
6 changed files with 70 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt
+1 -1
View File
@@ -48,7 +48,7 @@ public class KotlinImportOptimizer() : ImportOptimizer {
for (anImport in directives) {
directivesAfterCurrent.remove(anImport)
val importPath = JetPsiUtil.getImportPath(anImport)
val importPath = anImport.getImportPath()
if (importPath == null) {
continue
}
idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java
+2 -2
View File
@@ -27,9 +27,9 @@ import org.jetbrains.jet.lang.resolve.ImportPath;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.NamePackage;
import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
import org.jetbrains.jet.plugin.references.JetReference;
import org.jetbrains.jet.lang.resolve.name.NamePackage;
import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS;
import java.util.List;
@@ -169,7 +169,7 @@ public class ImportInsertHelper {
if (!importDirectives.isEmpty()) {
// Check if import is already present
for (JetImportDirective directive : importDirectives) {
ImportPath existentImportPath = JetPsiUtil.getImportPath(directive);
ImportPath existentImportPath = directive.getImportPath();
if (existentImportPath != null && NamePackage.isImported(importPath, existentImportPath)) {
return false;
}