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

Removed ex-ModuleConfiguration classes.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-10-30 12:08:48 +04:00
parent d0605009ae
commit b783175fb4
9 changed files with 29 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/weigher/JetDeclarationRemotenessWeigher.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class JetDeclarationRemotenessWeigher extends LookupElementWeigher {
return MyResult.notImported;
}
else {
if (ImportInsertHelper.isImportedWithKotlinDefault(importPath)) {
if (ImportInsertHelper.isImportedWithDefault(importPath, file)) {
return MyResult.kotlinDefaultImport;
}
return MyResult.imported;
idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+2 -2
View File
@@ -42,13 +42,13 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.asJava.LightClassUtil;
import org.jetbrains.jet.codegen.binding.PsiCodegenPredictor;
import org.jetbrains.jet.lang.DefaultModuleConfiguration;
import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptorImpl;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.java.mapping.KotlinToJavaTypesMap;
import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer;
@@ -222,7 +222,7 @@ public class JetSourceNavigationHelper {
}
});
ModuleDescriptorImpl moduleDescriptor = new ModuleDescriptorImpl(Name.special("<library module>"),
DefaultModuleConfiguration.DEFAULT_JET_IMPORTS,
AnalyzerFacadeForJVM.DEFAULT_IMPORTS,
PlatformToKotlinClassMap.EMPTY);
KotlinCodeAnalyzer analyzer = new ResolveSession(
project,
idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java
+8 -21
View File
@@ -22,18 +22,17 @@ import com.intellij.openapi.editor.Document;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.DefaultModuleConfiguration;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.ImportPath;
import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration;
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.plugin.project.ProjectStructureUtil;
import org.jetbrains.jet.plugin.references.JetPsiReference;
import org.jetbrains.jet.util.QualifiedNamesUtil;
import org.jetbrains.k2js.analyze.JsConfiguration;
import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS;
import java.util.List;
@@ -135,26 +134,14 @@ public class ImportInsertHelper {
}
}
if (isImportedWithKotlinDefault(importPath)) return true;
if (ProjectStructureUtil.isJsKotlinModule(jetFile)) {
return isImportedWithJsDefault(importPath);
}
else {
return isImportedWithJavaDefault(importPath);
}
return isImportedWithDefault(importPath, jetFile);
}
public static boolean isImportedWithJavaDefault(ImportPath importPath) {
return QualifiedNamesUtil.isImported(JavaBridgeConfiguration.DEFAULT_JAVA_IMPORTS, importPath);
}
public static boolean isImportedWithJsDefault(ImportPath importPath) {
return QualifiedNamesUtil.isImported(JsConfiguration.DEFAULT_IMPORT_PATHS, importPath);
}
public static boolean isImportedWithKotlinDefault(ImportPath importPath) {
return QualifiedNamesUtil.isImported(DefaultModuleConfiguration.DEFAULT_JET_IMPORTS, importPath);
public static boolean isImportedWithDefault(@NotNull ImportPath importPath, @NotNull JetFile contextFile) {
List<ImportPath> defaultImports = ProjectStructureUtil.isJsKotlinModule(contextFile)
? AnalyzerFacadeForJS.DEFAULT_IMPORTS
: AnalyzerFacadeForJVM.DEFAULT_IMPORTS;
return QualifiedNamesUtil.isImported(defaultImports, importPath);
}
public static boolean doNeedImport(@NotNull ImportPath importPath, @NotNull JetFile file) {