IDEA-72144 Import StringValue class

java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java

@@ -396,7 +396,11 @@ public class ImportHelper{
       }
     }
 
-    if (useOnDemand && curRefClass != null && "java.lang".equals(StringUtil.getPackageName(curRefClass.getQualifiedName()))) {
+    if (useOnDemand &&
+        curRefClass != null &&
+        refClass.getContainingClass() != null &&
+        mySettings.INSERT_INNER_CLASS_IMPORTS &&
+        "java.lang".equals(StringUtil.getPackageName(curRefClass.getQualifiedName()))) {
       return false;
     }
 

java/java-tests/testData/codeInsight/completion/normal/ImportStringValue.java

@@ -0,0 +1,5 @@
+public class Bar {
+    {
+        StringValu<caret>
+    }
+}

java/java-tests/testData/codeInsight/completion/normal/ImportStringValue_after.java

@@ -0,0 +1,7 @@
+import foo.*;
+
+public class Bar {
+    {
+        StringValue <caret>
+    }
+}

java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy

@@ -920,6 +920,12 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
     doTest '\n'
   }
 
+  public void testImportStringValue() throws Throwable {
+    myFixture.addClass("package foo; public class StringValue {}")
+    myFixture.addClass("package java.lang; class StringValue {}")
+    doTest ' '
+  }
+
   public void testPrimitiveArrayWithRBrace() throws Throwable { doTest '[' }
 
   public void testSuggestMembersOfStaticallyImportedClasses() throws Exception {