Only parse diamonds where they're welcomed

java/java-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java

@@ -34,6 +34,7 @@ import com.intellij.psi.impl.source.SourceTreeToPsiMap;
 import com.intellij.psi.impl.source.tree.TreeElement;
 import com.intellij.psi.javadoc.PsiDocComment;
 import com.intellij.psi.javadoc.PsiDocTag;
+import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.NotNull;
@@ -79,6 +80,13 @@ public class PsiJavaParserFacadeImpl extends PsiParserFacadeImpl implements PsiJ
   };
 
   public static final JavaParserUtil.ParserWrapper REFERENCE = new JavaParserUtil.ParserWrapper() {
+    @Override
+    public void parse(final PsiBuilder builder) {
+      ReferenceParser.parseJavaCodeReference(builder, false, true, false, false, false);
+    }
+  };
+
+  public static final JavaParserUtil.ParserWrapper DIAMOND_REF = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
       ReferenceParser.parseJavaCodeReference(builder, false, true, false, false, true);
@@ -293,7 +301,9 @@ public class PsiJavaParserFacadeImpl extends PsiParserFacadeImpl implements PsiJ
   public PsiJavaCodeReferenceElement createReferenceFromText(@NotNull final String text, final PsiElement context) throws IncorrectOperationException {
     final boolean isStaticImport = context instanceof PsiImportStaticStatement &&
                                    !((PsiImportStaticStatement)context).isOnDemand();
-    final JavaParserUtil.ParserWrapper wrapper = isStaticImport ? STATIC_IMPORT_REF : REFERENCE;
+    final boolean mayHaveDiamonds = context instanceof PsiNewExpression &&
+                                    PsiUtil.getLanguageLevel(context).isAtLeast(LanguageLevel.JDK_1_7);
+    final JavaParserUtil.ParserWrapper wrapper = isStaticImport ? STATIC_IMPORT_REF : mayHaveDiamonds ? DIAMOND_REF : REFERENCE;
     final DummyHolder holder = DummyHolderFactory.createHolder(myManager, new JavaDummyElement(text, wrapper, false), context);
     final PsiElement element = SourceTreeToPsiMap.treeElementToPsi(holder.getTreeElement().getFirstChildNode());
     if (!(element instanceof PsiJavaCodeReferenceElement)) {

java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java

@@ -524,7 +524,7 @@ public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement impleme
             throw new IncorrectOperationException(aClass.toString());
           }
           final PsiJavaParserFacade parserFacade = JavaPsiFacade.getInstance(getProject()).getParserFacade();
-          final PsiJavaCodeReferenceElement ref = parserFacade.createReferenceFromText(name, null);
+          final PsiJavaCodeReferenceElement ref = parserFacade.createReferenceFromText(name, getParent());
           getTreeParent().replaceChildInternal(this, (TreeElement)ref.getNode());
           return ref;
         }
@@ -562,7 +562,7 @@ public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement impleme
     final PsiManager manager = aClass.getManager();
     final PsiReferenceParameterList parameterList = getParameterList();
     String text = (parameterList != null ? qName + parameterList.getText() : qName);
-    PsiJavaCodeReferenceElement ref = facade.getParserFacade().createReferenceFromText(text, null);
+    PsiJavaCodeReferenceElement ref = facade.getParserFacade().createReferenceFromText(text, getParent());
     getTreeParent().replaceChildInternal(this, (TreeElement)ref.getNode());
     if (!preserveQualification /*&& (TreeUtil.findParent(ref, ElementType.DOC_COMMENT) == null)*/) {
       final JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(aClass.getProject());
@@ -605,7 +605,7 @@ public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement impleme
       throw new IncorrectOperationException("Cannot bind to default package: "+aPackage);
     }
     final PsiJavaParserFacade parserFacade = JavaPsiFacade.getInstance(getProject()).getParserFacade();
-    final PsiJavaCodeReferenceElement ref = parserFacade.createReferenceFromText(qName, null);
+    final PsiJavaCodeReferenceElement ref = parserFacade.createReferenceFromText(qName, getParent());
     getTreeParent().replaceChildInternal(this, (TreeElement)ref.getNode());
     return ref;
   }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addImport/after1.java

@@ -0,0 +1,8 @@
+import java.util.Map;
+
+// "Import Class" "true"
+public class Foo {
+    void foo() {
+        Ma<caret>p<> l;
+    }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addImport/before1.java

@@ -0,0 +1,6 @@
+// "Import Class" "true"
+public class Foo {
+    void foo() {
+        Ma<caret>p<> l;
+    }
+}

java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.intention;
+
+import com.intellij.codeInsight.daemon.LightIntentionActionTestCase;
+import com.intellij.openapi.roots.LanguageLevelProjectExtension;
+import com.intellij.pom.java.LanguageLevel;
+
+public class AddImportActionTest extends LightIntentionActionTestCase {
+
+  public void test() throws Exception {
+    final LanguageLevelProjectExtension extension = LanguageLevelProjectExtension.getInstance(getProject());
+
+    extension.setLanguageLevel(LanguageLevel.JDK_1_5);
+    doAllTests();
+
+    extension.setLanguageLevel(LanguageLevel.HIGHEST);
+    doAllTests();
+  }
+
+  @Override
+  protected String getBasePath() {
+    return "/codeInsight/daemonCodeAnalyzer/quickFix/addImport";
+  }
+}