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

Removed check for classes in java.lang because it's not used by completion anymore and causes problems with importing of java.lang.String on paste

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-12-03 21:21:55 +03:00
parent 796a2b6e7c
commit c76e69af62
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java
-5
View File
@@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.ImportPath;
import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM;
import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.NamePackage; import org.jetbrains.jet.lang.resolve.name.NamePackage;
import org.jetbrains.jet.plugin.project.ProjectStructureUtil; import org.jetbrains.jet.plugin.project.ProjectStructureUtil;
@@ -116,10 +115,6 @@ public class ImportInsertHelperImpl extends ImportInsertHelper {
List<ImportPath> defaultImports = ProjectStructureUtil.isJsKotlinModule(contextFile) List<ImportPath> defaultImports = ProjectStructureUtil.isJsKotlinModule(contextFile)
? TopDownAnalyzerFacadeForJS.DEFAULT_IMPORTS ? TopDownAnalyzerFacadeForJS.DEFAULT_IMPORTS
: TopDownAnalyzerFacadeForJVM.DEFAULT_IMPORTS; : TopDownAnalyzerFacadeForJVM.DEFAULT_IMPORTS;
if (importPath.fqnPart().asString().startsWith("java.lang.")
&& !JavaToKotlinClassMap.INSTANCE.mapPlatformClass(importPath.fqnPart()).isEmpty()) {
return false;
}
return NamePackage.isImported(importPath, defaultImports); return NamePackage.isImported(importPath, defaultImports);
} }