From c76e69af62f2d035675f4d854ccef56e754fee47 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 3 Dec 2014 21:21:55 +0300 Subject: [PATCH] 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 --- .../jet/plugin/quickfix/ImportInsertHelperImpl.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java index da28b59a5b1..4037a3c2737 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java @@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.ImportPath; 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.NamePackage; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; @@ -116,10 +115,6 @@ public class ImportInsertHelperImpl extends ImportInsertHelper { List defaultImports = ProjectStructureUtil.isJsKotlinModule(contextFile) ? TopDownAnalyzerFacadeForJS.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); }