Snapshot df6c5fa1206345df60a0c86fe8f67c5f7a6f478f from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: I1d62dfd281ca361774653165ce8da9fb93d51005

39 files changed, 469 insertions, 306 deletions

diff --git a/java/java-impl/src/com/intellij/analysis/BaseClassesAnalysisAction.java b/java/java-impl/src/com/intellij/analysis/BaseClassesAnalysisAction.java
index 7bd5feb01cef..9d13990e61a3 100644
--- a/java/java-impl/src/com/intellij/analysis/BaseClassesAnalysisAction.java
+++ b/java/java-impl/src/com/intellij/analysis/BaseClassesAnalysisAction.java
@@ -39,7 +39,7 @@ public abstract class BaseClassesAnalysisAction extends BaseAnalysisAction {
   protected abstract void analyzeClasses(final Project project, final AnalysisScope scope, ProgressIndicator indicator);
 
   @Override
-  protected void analyze(@NotNull final Project project, final AnalysisScope scope) {
+  protected void analyze(@NotNull final Project project, @NotNull final AnalysisScope scope) {
     FileDocumentManager.getInstance().saveAllDocuments();
 
     ProgressManager.getInstance().run(new Task.Backgroundable(project, AnalysisScopeBundle.message("analyzing.project"), true) {
diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java
index 63d7a8932ef1..0751887a2409 100644
--- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java
+++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java
@@ -19,6 +19,7 @@ package com.intellij.codeInsight;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.NullableComputable;
 import com.intellij.psi.*;
+import com.intellij.psi.util.PsiUtil;
 import org.jetbrains.annotations.NotNull;
 
 public class ExpectedTypeInfoImpl implements ExpectedTypeInfo {
@@ -83,8 +84,8 @@ public class ExpectedTypeInfoImpl implements ExpectedTypeInfo {
 
     this.defaultType = defaultType;
 
-    assert type.isValid();
-    assert defaultType.isValid();
+    PsiUtil.ensureValidType(type);
+    PsiUtil.ensureValidType(defaultType);
   }
 
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java
index 853debf37051..ee6de0545115 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java
@@ -144,8 +144,8 @@ public class JavaCompletionSorting {
     PsiType itemType = JavaCompletionUtil.getLookupElementType(item);
 
     if (itemType != null) {
-      assert itemType.isValid() : item + "; " + item.getClass();
-      
+      PsiUtil.ensureValidType(itemType);
+
       for (final ExpectedTypeInfo expectedInfo : expectedInfos) {
         final PsiType defaultType = expectedInfo.getDefaultType();
         final PsiType expectedType = expectedInfo.getType();
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java
index 1026f48f432f..b2896f336a9a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java
@@ -30,6 +30,7 @@ import com.intellij.psi.codeStyle.VariableKind;
 import com.intellij.psi.util.PropertyUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
+import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.refactoring.introduceField.InplaceIntroduceFieldPopup;
 import com.intellij.refactoring.introduceVariable.IntroduceVariableBase;
 import com.intellij.util.ArrayUtil;
@@ -373,9 +374,9 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor {
     for (final PsiField field : psiClass.getFields()) {
       if (field == element) continue;
 
-      assert field.isValid() : "invalid field: " + field;
+      PsiUtilCore.ensureValid(field);
       PsiType fieldType = field.getType();
-      assert fieldType.isValid() : "invalid field type: " + field + "; " + fieldType + " of " + fieldType.getClass();
+      PsiUtil.ensureValidType(fieldType);
 
       final PsiModifierList modifierList = field.getModifierList();
       if (staticContext && (modifierList != null && !modifierList.hasModifierProperty(PsiModifier.STATIC))) continue;
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
index 6849d7469525..b1cbfe05c3b2 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
@@ -413,18 +413,32 @@ public class AnnotationsHighlightUtil {
           }
 
           @Override
+          public void visitClassObjectAccessExpression(PsiClassObjectAccessExpression expression) {
+            super.visitClassObjectAccessExpression(expression);
+            final PsiTypeElement operand = expression.getOperand();
+            final PsiClass classType = PsiUtil.resolveClassInType(operand.getType());
+            if (classType != null) {
+              checkAccessibility(expression, classType, HighlightUtil.formatClass(classType));
+            }
+          }
+
+          @Override
           public void visitReferenceExpression(PsiReferenceExpression expression) {
             super.visitReferenceExpression(expression);
             final PsiElement resolve = expression.resolve();
-            if (resolve instanceof PsiField &&
-                ((PsiMember)resolve).hasModifierProperty(PsiModifier.PRIVATE) &&
+            if (resolve instanceof PsiField) {
+              checkAccessibility(expression, (PsiMember)resolve, HighlightUtil.formatField((PsiField)resolve));
+            }
+          }
+
+          private void checkAccessibility(PsiExpression expression, PsiMember resolve, String memberString) {
+            if (resolve.hasModifierProperty(PsiModifier.PRIVATE) &&
                 PsiTreeUtil.isAncestor(parent, resolve, true)) {
               String description = JavaErrorMessages.message("private.symbol",
-                                                             HighlightUtil.formatField((PsiField)resolve),
+                                                             memberString,
                                                              HighlightUtil.formatClass((PsiClass)parent));
-              HighlightInfo result =
+              infos[0] =
                 HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(expression).descriptionAndTooltip(description).create();
-              infos[0] = result;
             }
           }
         });
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index 5354932c4201..55055c93b83c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -1936,6 +1936,11 @@ public class HighlightUtil extends HighlightUtilBase {
             !thisOrSuperReference(((PsiReferenceExpression)expression).getQualifierExpression(), aClass)) {
           return null;
         }
+
+        if (expression instanceof PsiJavaCodeReferenceElement && !aClass.equals(PsiTreeUtil.getParentOfType(expression, PsiClass.class))) {
+          return null;
+        }
+
         final HighlightInfo highlightInfo = createMemberReferencedError(resolvedName, expression.getTextRange());
         if (expression instanceof PsiReferenceExpression && PsiUtil.isInnerClass(aClass)) {
           final String referenceName = ((PsiReferenceExpression)expression).getReferenceName();
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java
index 128f2781c28c..ad63c638f5d0 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java
@@ -793,10 +793,13 @@ public class CreateFromUsageUtils {
         WeighingComparable<PsiElement,ProximityLocation> proximity1 = PsiProximityComparator.getProximity(m1, expression);
         WeighingComparable<PsiElement,ProximityLocation> proximity2 = PsiProximityComparator.getProximity(m2, expression);
         if (proximity1 != null && proximity2 != null) {
-          return proximity2.compareTo(proximity1);
+          result = proximity2.compareTo(proximity1);
+          if (result != 0) return result;
         }
 
-        return 0;
+        String name1 = StaticImportMethodFix.getMemberQualifiedName(m1);
+        String name2 = StaticImportMethodFix.getMemberQualifiedName(m2);
+        return name1 == null || name2 == null ? 0 : name1.compareTo(name2);
       }
     });
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DelegateWithDefaultParamValueIntentionAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DelegateWithDefaultParamValueIntentionAction.java
index 12507bdfe4fa..856ffee4ef5d 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DelegateWithDefaultParamValueIntentionAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DelegateWithDefaultParamValueIntentionAction.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.hint.HintManager;
 import com.intellij.codeInsight.intention.LowPriorityAction;
 import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
@@ -101,6 +102,8 @@ public class DelegateWithDefaultParamValueIntentionAction extends PsiElementBase
       return;
     }
 
+    if (!FileModificationService.getInstance().preparePsiElementForWrite(element)) return;
+    
     Runnable runnable = new Runnable() {
       @Override
       public void run() {
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java
index a292fe657714..32d3e0548cba 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java
@@ -60,7 +60,7 @@ public class TypeExpression extends Expression {
 
       @Override
       public String toString() {
-        return myItems.size() == 1 ? type.getCanonicalText() : super.toString();
+        return myItems.size() == 1 ? super.toString() : type.getPresentableText();
       }
     };
   }
@@ -85,8 +85,4 @@ public class TypeExpression extends Expression {
     return result.toArray(new LookupElement[result.size()]);
   }
 
-  public boolean hasSuggestions() {
-    return myItems.size() > 1;
-  }
-
 }
diff --git a/java/java-impl/src/com/intellij/codeInsight/template/JavaCodeContextType.java b/java/java-impl/src/com/intellij/codeInsight/template/JavaCodeContextType.java
index 42e990f3aee0..cb1c0b9a3393 100644
--- a/java/java-impl/src/com/intellij/codeInsight/template/JavaCodeContextType.java
+++ b/java/java-impl/src/com/intellij/codeInsight/template/JavaCodeContextType.java
@@ -99,7 +99,14 @@ public abstract class JavaCodeContextType extends TemplateContextType {
         return false;
       }
       
-      PsiStatement statement = PsiTreeUtil.getParentOfType(element, PsiStatement.class);
+      PsiElement statement = PsiTreeUtil.getParentOfType(element, PsiStatement.class, PsiLambdaExpression.class);
+      if (statement instanceof PsiLambdaExpression) {
+        PsiElement body = ((PsiLambdaExpression)statement).getBody();
+        if (body != null && PsiTreeUtil.isAncestor(body, element, false)) {
+          statement = body;
+        }
+      }
+
       return statement != null && statement.getTextRange().getStartOffset() == element.getTextRange().getStartOffset();
     }
   }
diff --git a/java/java-impl/src/com/intellij/codeInsight/template/PsiTypeResult.java b/java/java-impl/src/com/intellij/codeInsight/template/PsiTypeResult.java
index 6892437177af..3a3f750131b2 100644
--- a/java/java-impl/src/com/intellij/codeInsight/template/PsiTypeResult.java
+++ b/java/java-impl/src/com/intellij/codeInsight/template/PsiTypeResult.java
@@ -57,7 +57,7 @@ public class PsiTypeResult implements RecalculatableResult {
   }
 
   public String toString() {
-    return getType().getPresentableText();
+    return getType().getCanonicalText();
   }
 
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/ClassNameMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/ClassNameMacro.java
index 6d786e2932c7..2d0d69e7be6a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/template/macro/ClassNameMacro.java
+++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/ClassNameMacro.java
@@ -58,12 +58,8 @@ public class ClassNameMacro extends Macro {
     }
 
     if (aClass == null) return null;
-    String result = aClass.getName();
-    while (aClass.getContainingClass() != null && aClass.getContainingClass().getName() != null) {
-      result = aClass.getContainingClass().getName() + "$" + result;
-      aClass = aClass.getContainingClass();
-    }
-    return new TextResult(result);
+    String qname = aClass.getQualifiedName();
+    return qname == null ? null : new TextResult(qname);
   }
 
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/DeadHTMLComposer.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/DeadHTMLComposer.java
index e75d1b142069..ead1b1fa8860 100644
--- a/java/java-impl/src/com/intellij/codeInspection/deadCode/DeadHTMLComposer.java
+++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/DeadHTMLComposer.java
@@ -43,8 +43,7 @@ public class DeadHTMLComposer extends HTMLComposerImpl {
   private final InspectionTool myTool;
   private final HTMLJavaHTMLComposer myComposer;
 
-  public DeadHTMLComposer(InspectionTool tool) {
-    super();
+  public DeadHTMLComposer(@NotNull InspectionTool tool) {
     myTool = tool;
     myComposer = getExtension(HTMLJavaHTMLComposer.COMPOSER);
   }
@@ -340,7 +339,7 @@ public class DeadHTMLComposer extends HTMLComposerImpl {
 
   private void appendCallesList(RefElement element, StringBuffer buf, Set<RefElement> mentionedElements, boolean appendCallees){
     final Set<RefElement> possibleChildren = getPossibleChildren(new RefElementNode(element, myTool), element);
-    if (possibleChildren.size() > 0) {
+    if (!possibleChildren.isEmpty()) {
       if (appendCallees){
         appendHeading(buf, InspectionsBundle.message("inspection.export.results.callees"));
       }
diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/RefUnreachableFilter.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/RefUnreachableFilter.java
index 650e7c527edf..5984cf16b71a 100644
--- a/java/java-impl/src/com/intellij/codeInspection/deadCode/RefUnreachableFilter.java
+++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/RefUnreachableFilter.java
@@ -30,6 +30,7 @@ import com.intellij.codeInspection.util.RefFilter;
 import org.jetbrains.annotations.NotNull;
 
 public class RefUnreachableFilter extends RefFilter {
+  @NotNull
   protected InspectionTool myTool;
 
   public RefUnreachableFilter(@NotNull InspectionTool tool) {
diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java
index 70f22c0765fc..54a42a66f95b 100644
--- a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java
@@ -515,7 +515,7 @@ public class UnusedDeclarationInspection extends FilteringInspectionTool {
   }
 
   private static class StrictUnreferencedFilter extends UnreferencedFilter {
-    private StrictUnreferencedFilter(final InspectionTool tool) {
+    private StrictUnreferencedFilter(@NotNull InspectionTool tool) {
       super(tool);
     }
 
diff --git a/java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java b/java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java
index d76ae5cbef92..9d2b2c9c6452 100644
--- a/java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java
+++ b/java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java
@@ -65,7 +65,7 @@ public class InferNullityAnnotationsAction extends BaseAnalysisAction {
   }
 
   @Override
-  protected void analyze(@NotNull final Project project, final AnalysisScope scope) {
+  protected void analyze(@NotNull final Project project, @NotNull final AnalysisScope scope) {
     final ProgressManager progressManager = ProgressManager.getInstance();
     final int totalFiles = scope.getFileCount();
 
diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java
index ea832d151cf0..5d576bbbd27e 100644
--- a/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java
@@ -76,7 +76,7 @@ public class UnusedParametersInspection extends GlobalJavaInspectionTool {
 
       if (refMethod.isAppMain()) return null;
 
-      final ArrayList<RefParameter> unusedParameters = getUnusedParameters(refMethod);
+      final List<RefParameter> unusedParameters = getUnusedParameters(refMethod);
 
       if (unusedParameters.isEmpty()) return null;
 
@@ -111,14 +111,14 @@ public class UnusedParametersInspection extends GlobalJavaInspectionTool {
     }
 
     final PsiSearchHelper helper = PsiSearchHelper.SERVICE.getInstance(project);
-    final AnalysisScope scope = ((RefManagerImpl)manager).getScope();
+    final AnalysisScope scope = manager.getScope();
     manager.iterate(new RefJavaVisitor() {
       @Override
       public void visitElement(@NotNull RefEntity refEntity) {
         if (refEntity instanceof RefMethod) {
           RefMethod refMethod = (RefMethod)refEntity;
           final PsiModifierListOwner element = refMethod.getElement();
-          if (element instanceof PsiMethod) { //implicit construcors are invisible
+          if (element instanceof PsiMethod) { //implicit constructors are invisible
             PsiMethod psiMethod = (PsiMethod)element;
             if (!refMethod.isStatic() && !refMethod.isConstructor() && !PsiModifier.PRIVATE.equals(refMethod.getAccessModifier())) {
               final ArrayList<RefParameter> unusedParameters = getUnusedParameters(refMethod);
diff --git a/java/java-impl/src/com/intellij/externalSystem/JavaProjectData.java b/java/java-impl/src/com/intellij/externalSystem/JavaProjectData.java
index 29f991c88712..9deea918441a 100644
--- a/java/java-impl/src/com/intellij/externalSystem/JavaProjectData.java
+++ b/java/java-impl/src/com/intellij/externalSystem/JavaProjectData.java
@@ -17,6 +17,7 @@ package com.intellij.externalSystem;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.externalSystem.model.Key;
+import com.intellij.openapi.externalSystem.model.ProjectKeys;
 import com.intellij.openapi.externalSystem.model.ProjectSystemId;
 import com.intellij.openapi.externalSystem.model.project.AbstractExternalEntityData;
 import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
@@ -33,9 +34,9 @@ import java.util.regex.Pattern;
  * @since 4/12/13 12:27 PM
  */
 public class JavaProjectData extends AbstractExternalEntityData {
-  
-  @NotNull public static final Key<JavaProjectData> KEY = Key.create(JavaProjectData.class);
-  
+
+  @NotNull public static final Key<JavaProjectData> KEY = Key.create(JavaProjectData.class, ProjectKeys.PROJECT.getProcessingWeight() + 1);
+
   private static final Logger LOG = Logger.getInstance("#" + JavaProjectData.class.getName());
 
   private static final long serialVersionUID = 1L;
@@ -47,7 +48,7 @@ public class JavaProjectData extends AbstractExternalEntityData {
   @NotNull private JavaSdkVersion myJdkVersion    = DEFAULT_JDK_VERSION;
   @NotNull private LanguageLevel  myLanguageLevel = DEFAULT_LANGUAGE_LEVEL;
 
-  @NotNull private  String myCompileOutputPath;
+  @NotNull private String myCompileOutputPath;
 
   public JavaProjectData(@NotNull ProjectSystemId owner, @NotNull String compileOutputPath) {
     super(owner);
diff --git a/java/java-impl/src/com/intellij/javadoc/actions/GenerateJavadocAction.java b/java/java-impl/src/com/intellij/javadoc/actions/GenerateJavadocAction.java
index 2b88c43312e6..068f527c0170 100644
--- a/java/java-impl/src/com/intellij/javadoc/actions/GenerateJavadocAction.java
+++ b/java/java-impl/src/com/intellij/javadoc/actions/GenerateJavadocAction.java
@@ -36,7 +36,7 @@ public final class GenerateJavadocAction extends BaseAnalysisAction{
   }
 
   @Override
-  protected void analyze(@NotNull Project project, AnalysisScope scope) {
+  protected void analyze(@NotNull Project project, @NotNull AnalysisScope scope) {
     myConfigurable.apply();
     JavadocGenerationManager.getInstance(project).generateJavadoc(scope);
     dispose();
diff --git a/java/java-impl/src/com/intellij/lang/java/JavaFindUsagesProvider.java b/java/java-impl/src/com/intellij/lang/java/JavaFindUsagesProvider.java
index 3d8558e8d128..2a69d6fdc898 100644
--- a/java/java-impl/src/com/intellij/lang/java/JavaFindUsagesProvider.java
+++ b/java/java-impl/src/com/intellij/lang/java/JavaFindUsagesProvider.java
@@ -199,7 +199,8 @@ public class JavaFindUsagesProvider implements FindUsagesProvider {
       return LangBundle.message("java.terms.of.anonymous.class", formatted);
     }
     else {
-      String className = aClass.getName();
+      final String qualifiedName = aClass.getQualifiedName();
+      final String className = qualifiedName != null ? qualifiedName : aClass.getName();
       if (aClass.isInterface()) {
         return LangBundle.message("java.terms.of.interface", formatted, className);
       }
diff --git a/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java b/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java
index d26892e68981..c9d53ae387e8 100644
--- a/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java
+++ b/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 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.
@@ -19,7 +19,7 @@ import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.impl.CheckUtil;
-import com.intellij.psi.impl.source.codeStyle.ReferenceAdjuster;
+import com.intellij.psi.impl.source.codeStyle.JavaReferenceAdjuster;
 import com.intellij.psi.impl.source.resolve.JavaResolveUtil;
 import com.intellij.psi.impl.source.resolve.ResolveCache;
 import com.intellij.psi.meta.PsiMetaData;
@@ -187,7 +187,7 @@ public abstract class AbstractQualifiedReference<T extends AbstractQualifiedRefe
   protected AbstractQualifiedReference shortenReferences() {
     final PsiElement refElement = resolve();
     if (refElement instanceof PsiClass) {
-      final PsiQualifiedReference reference = ReferenceAdjuster.getClassReferenceToShorten((PsiClass)refElement, false, this);
+      final PsiQualifiedReference reference = JavaReferenceAdjuster.getClassReferenceToShorten((PsiClass)refElement, false, this);
       if (reference instanceof AbstractQualifiedReference) {
         ((AbstractQualifiedReference)reference).dequalify();
       }
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
index e07d64a8d081..8beff5d7b21e 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2013 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.
@@ -19,6 +19,7 @@
  */
 package com.intellij.psi.impl.source.codeStyle;
 
+import com.intellij.lang.ASTNode;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
@@ -29,7 +30,6 @@ import com.intellij.psi.codeStyle.*;
 import com.intellij.psi.impl.CheckUtil;
 import com.intellij.psi.impl.source.SourceTreeToPsiMap;
 import com.intellij.psi.impl.source.jsp.jspJava.JspxImportStatement;
-import com.intellij.psi.impl.source.tree.TreeElement;
 import com.intellij.psi.statistics.JavaStatisticsManager;
 import com.intellij.psi.util.PsiElementFilter;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -74,8 +74,15 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
 
     final boolean addImports = (flags & DO_NOT_ADD_IMPORTS) == 0;
     final boolean incompleteCode = (flags & UNCOMPLETE_CODE) != 0;
-    final TreeElement reference = new ReferenceAdjuster(myProject).process((TreeElement)element.getNode(), addImports, incompleteCode);
-    return SourceTreeToPsiMap.treeToPsiNotNull(reference);
+
+    final ReferenceAdjuster adjuster = ReferenceAdjuster.Extension.getReferenceAdjuster(element.getLanguage());
+    if (adjuster != null) {
+      final ASTNode reference = adjuster.process(element.getNode(), addImports, incompleteCode, myProject);
+      return SourceTreeToPsiMap.treeToPsiNotNull(reference);
+    }
+    else {
+      return element;
+    }
   }
 
   @Override
@@ -83,14 +90,21 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
     throws IncorrectOperationException {
     CheckUtil.checkWritable(element);
     if (SourceTreeToPsiMap.hasTreeElement(element)) {
-      new ReferenceAdjuster(myProject).processRange((TreeElement)element.getNode(), startOffset, endOffset);
+      final ReferenceAdjuster adjuster = ReferenceAdjuster.Extension.getReferenceAdjuster(element.getLanguage());
+      if (adjuster != null) {
+        adjuster.processRange(element.getNode(), startOffset, endOffset, myProject);
+      }
     }
   }
 
   @Override
   public PsiElement qualifyClassReferences(@NotNull PsiElement element) {
-    final TreeElement reference = new ReferenceAdjuster(true, true).process((TreeElement)element.getNode(), false, false);
-    return SourceTreeToPsiMap.treeToPsiNotNull(reference);
+    final ReferenceAdjuster adjuster = ReferenceAdjuster.Extension.getReferenceAdjuster(element.getLanguage());
+    if (adjuster != null) {
+      final ASTNode reference = adjuster.process(element.getNode(), false, false, true, true);
+      return SourceTreeToPsiMap.treeToPsiNotNull(reference);
+    }
+    return element;
   }
 
   @Override
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ReferenceAdjuster.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjuster.java
index 0f9e2865fff7..446a6a2b4aa0 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ReferenceAdjuster.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaReferenceAdjuster.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
+import com.intellij.psi.codeStyle.ReferenceAdjuster;
 import com.intellij.psi.impl.PsiImplUtil;
 import com.intellij.psi.impl.source.PsiJavaCodeReferenceElementImpl;
 import com.intellij.psi.impl.source.SourceJavaCodeReference;
@@ -34,24 +35,9 @@ import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ReferenceAdjuster {
-  private final boolean myUseFqClassNamesInJavadoc;
-  private final boolean myUseFqClassNames;
-
-  public ReferenceAdjuster(boolean useFqInJavadoc, boolean useFqInCode) {
-    myUseFqClassNamesInJavadoc = useFqInJavadoc;
-    myUseFqClassNames = useFqInCode;
-  }
-
-  public ReferenceAdjuster(Project project) {
-    this(CodeStyleSettingsManager.getSettings(project));
-  }
-
-  public ReferenceAdjuster(CodeStyleSettings settings) {
-    this(settings.USE_FQ_CLASS_NAMES_IN_JAVADOC, settings.USE_FQ_CLASS_NAMES);
-  }
-
-  public TreeElement process(TreeElement element, boolean addImports, boolean incompleteCode) {
+public class JavaReferenceAdjuster implements ReferenceAdjuster {
+  @Override
+  public ASTNode process(ASTNode element, boolean addImports, boolean incompleteCode, boolean useFqInJavadoc, boolean useFqInCode) {
     IElementType elementType = element.getElementType();
     if ((elementType == JavaElementType.JAVA_CODE_REFERENCE || elementType == JavaElementType.REFERENCE_EXPRESSION) && !isAnnotated(element)) {
       IElementType parentType = element.getTreeParent().getElementType();
@@ -63,7 +49,7 @@ public class ReferenceAdjuster {
         if (parameterList != null) {
           PsiTypeElement[] typeParameters = parameterList.getTypeParameterElements();
           for (PsiTypeElement typeParameter : typeParameters) {
-            process((TreeElement)typeParameter.getNode(), addImports, incompleteCode);
+            process(typeParameter.getNode(), addImports, incompleteCode, useFqInJavadoc, useFqInCode);
           }
         }
 
@@ -76,7 +62,7 @@ public class ReferenceAdjuster {
         if (rightKind) {
           boolean isInsideDocComment = TreeUtil.findParent(element, JavaDocElementType.DOC_COMMENT) != null;
           boolean isShort = !ref.isQualified();
-          if (!makeFQ(isInsideDocComment)) {
+          if (isInsideDocComment ? !useFqInJavadoc : !useFqInCode) {
             if (isShort) return element; // short name already, no need to change
           }
 
@@ -85,13 +71,14 @@ public class ReferenceAdjuster {
             refElement = ref.resolve();
           }
           else {
-            PsiResolveHelper helper = JavaPsiFacade.getInstance(element.getManager().getProject()).getResolveHelper();
-            refElement = helper.resolveReferencedClass(((SourceJavaCodeReference)element).getClassNameText(), ref);
+            PsiResolveHelper helper = JavaPsiFacade.getInstance(ref.getManager().getProject()).getResolveHelper();
+            final SourceJavaCodeReference reference = (SourceJavaCodeReference)element;
+            refElement = helper.resolveReferencedClass(reference.getClassNameText(), ref);
           }
 
           if (refElement instanceof PsiClass) {
             PsiClass psiClass = (PsiClass)refElement;
-            if (makeFQ(isInsideDocComment)) {
+            if (isInsideDocComment ? useFqInJavadoc : useFqInCode) {
               String qName = psiClass.getQualifiedName();
               if (qName == null) return element;
 
@@ -99,26 +86,26 @@ public class ReferenceAdjuster {
               if (file instanceof PsiJavaFile) {
                 if (ImportHelper.isImplicitlyImported(qName, (PsiJavaFile)file)) {
                   if (isShort) return element;
-                  return (TreeElement)makeShortReference((CompositeElement)element, psiClass, addImports);
+                  return makeShortReference((CompositeElement)element, psiClass, addImports);
                 }
 
                 String thisPackageName = ((PsiJavaFile)file).getPackageName();
                 if (ImportHelper.hasPackage(qName, thisPackageName)) {
                   if (!isShort) {
-                    return (TreeElement)makeShortReference((CompositeElement)element, psiClass, addImports);
+                    return makeShortReference((CompositeElement)element, psiClass, addImports);
                   }
                 }
               }
 
-              return (TreeElement)replaceReferenceWithFQ(element, psiClass);
+              return replaceReferenceWithFQ(element, psiClass);
             }
             else {
               int oldLength = element.getTextLength();
-              TreeElement treeElement = (TreeElement)makeShortReference((CompositeElement)element, psiClass, addImports);
+              ASTNode treeElement = makeShortReference((CompositeElement)element, psiClass, addImports);
               if (treeElement.getTextLength() == oldLength && psiClass.getContainingClass() != null) {
                 PsiElement qualifier = ref.getQualifier();
                 if (qualifier instanceof PsiJavaCodeReferenceElement && ((PsiJavaCodeReferenceElement)qualifier).resolve() instanceof PsiClass) {
-                  process((TreeElement)qualifier.getNode(), addImports, incompleteCode);
+                  process(qualifier.getNode(), addImports, incompleteCode, useFqInJavadoc, useFqInCode);
                 }
               }
               return treeElement;
@@ -128,15 +115,21 @@ public class ReferenceAdjuster {
       }
     }
 
-    for (TreeElement child = element.getFirstChildNode(); child != null; child = child.getTreeNext()) {
+    for (ASTNode child = element.getFirstChildNode(); child != null; child = child.getTreeNext()) {
       //noinspection AssignmentToForLoopParameter
-      child = process(child, addImports, incompleteCode);
+      child = process(child, addImports, incompleteCode, useFqInJavadoc, useFqInCode);
     }
 
     return element;
   }
 
-  private static boolean isAnnotated(TreeElement element) {
+  @Override
+  public ASTNode process(ASTNode element, boolean addImports, boolean incompleteCode, Project project) {
+    final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(project);
+    return process(element, addImports, incompleteCode, settings.USE_FQ_CLASS_NAMES_IN_JAVADOC, settings.USE_FQ_CLASS_NAMES);
+  }
+
+  private static boolean isAnnotated(ASTNode element) {
     PsiJavaCodeReferenceElement ref = (PsiJavaCodeReferenceElement)element.getPsi();
 
     PsiElement qualifier = ref.getQualifier();
@@ -156,21 +149,24 @@ public class ReferenceAdjuster {
     return false;
   }
 
-  private boolean makeFQ(boolean isInsideDocComment) {
-    return isInsideDocComment ? myUseFqClassNamesInJavadoc : myUseFqClassNames;
-  }
-
-  public void processRange(TreeElement element, int startOffset, int endOffset) {
+  @Override
+  public void processRange(ASTNode element, int startOffset, int endOffset, boolean useFqInJavadoc, boolean useFqInCode) {
     List<ASTNode> array = new ArrayList<ASTNode>();
     addReferencesInRange(array, element, startOffset, endOffset);
     for (ASTNode ref : array) {
       if (ref.getPsi().isValid()) {
-        process((TreeElement)ref, true, true);
+        process(ref, true, true, useFqInJavadoc, useFqInCode);
       }
     }
   }
 
-  private static void addReferencesInRange(List<ASTNode> array, TreeElement parent, int startOffset, int endOffset) {
+  @Override
+  public void processRange(ASTNode element, int startOffset, int endOffset, Project project) {
+    final CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(project);
+    processRange(element, startOffset, endOffset, settings.USE_FQ_CLASS_NAMES_IN_JAVADOC, settings.USE_FQ_CLASS_NAMES);
+  }
+
+  private static void addReferencesInRange(List<ASTNode> array, ASTNode parent, int startOffset, int endOffset) {
     if (parent.getElementType() == JavaElementType.JAVA_CODE_REFERENCE || parent.getElementType() == JavaElementType.REFERENCE_EXPRESSION) {
       array.add(parent);
       return;
@@ -180,7 +176,7 @@ public class ReferenceAdjuster {
       JspFile jspFile = JspPsiUtil.getJspFile(parent.getPsi());
       if (jspFile != null) {
         JspClass jspClass = (JspClass)jspFile.getJavaClass();
-        addReferencesInRange(array, (TreeElement)jspClass.getNode(), startOffset, endOffset);
+        addReferencesInRange(array, jspClass.getNode(), startOffset, endOffset);
         return;
       }
     }
@@ -188,9 +184,9 @@ public class ReferenceAdjuster {
     addReferencesInRangeForComposite(array, parent, startOffset, endOffset);
   }
 
-  private static void addReferencesInRangeForComposite(List<ASTNode> array, TreeElement parent, int startOffset, int endOffset) {
+  private static void addReferencesInRangeForComposite(List<ASTNode> array, ASTNode parent, int startOffset, int endOffset) {
     int offset = 0;
-    for (TreeElement child = parent.getFirstChildNode(); child != null; child = child.getTreeNext()) {
+    for (ASTNode child = parent.getFirstChildNode(); child != null; child = child.getTreeNext()) {
       int length = child.getTextLength();
       if (startOffset <= offset + length && offset <= endOffset) {
         IElementType type = child.getElementType();
@@ -214,8 +210,8 @@ public class ReferenceAdjuster {
 
   @Nullable
   public static PsiQualifiedReferenceElement getClassReferenceToShorten(@NotNull final PsiClass refClass,
-                                                                 final boolean addImports,
-                                                                 @NotNull final PsiQualifiedReferenceElement reference) {
+                                                                        final boolean addImports,
+                                                                        @NotNull final PsiQualifiedReferenceElement reference) {
     PsiClass parentClass = refClass.getContainingClass();
     if (parentClass != null) {
       JavaPsiFacade facade = JavaPsiFacade.getInstance(parentClass.getProject());
@@ -226,7 +222,7 @@ public class ReferenceAdjuster {
 
       if (!CodeStyleSettingsManager.getSettings(reference.getProject()).INSERT_INNER_CLASS_IMPORTS) {
         final PsiElement qualifier = reference.getQualifier();
-        if (qualifier instanceof PsiQualifiedReference) {
+        if (qualifier instanceof PsiQualifiedReferenceElement) {
           return getClassReferenceToShorten(parentClass, addImports, (PsiQualifiedReferenceElement)qualifier);
         }
         return null;
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaLangClassMemberReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaLangClassMemberReference.java
index 553233451a8b..13644930d88e 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaLangClassMemberReference.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/JavaLangClassMemberReference.java
@@ -163,7 +163,7 @@ public class JavaLangClassMemberReference extends PsiReferenceBase<PsiLiteralExp
   private static String getMethodTypes(PsiMethod method) {
     final StringBuilder buf = new StringBuilder();
     for (PsiParameter parameter : method.getParameterList().getParameters()) {
-      buf.append(", ").append(((PsiClassReferenceType)parameter.getType()).getReference().getReferenceName()).append(".class");
+      buf.append(", ").append(TypeConversionUtil.erasure(parameter.getType()).getPresentableText()).append(".class");
     }
     return buf.toString();
   }
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/JavaConcatenationInjectorManager.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/JavaConcatenationInjectorManager.java
index ef072b733f02..5b4dd7af48b7 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/JavaConcatenationInjectorManager.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/JavaConcatenationInjectorManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2013 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.
@@ -41,7 +41,6 @@ import java.util.List;
 public class JavaConcatenationInjectorManager implements ModificationTracker {
   public static final ExtensionPointName<ConcatenationAwareInjector> CONCATENATION_INJECTOR_EP_NAME = ExtensionPointName.create("com.intellij.concatenationAwareInjector");
   private volatile long myModificationCounter;
-  private static final ConcatenationPsiCachedValueProvider CONCATENATION_PSI_CACHED_VALUE_PROVIDER = new ConcatenationPsiCachedValueProvider();
 
   public JavaConcatenationInjectorManager(Project project, PsiManagerEx psiManagerEx) {
     final ExtensionPoint<ConcatenationAwareInjector> concatPoint = Extensions.getArea(project).getExtensionPoint(CONCATENATION_INJECTOR_EP_NAME);
@@ -73,17 +72,7 @@ public class JavaConcatenationInjectorManager implements ModificationTracker {
     return myModificationCounter;
   }
 
-  private static class ConcatenationPsiCachedValueProvider implements ParameterizedCachedValueProvider<MultiHostRegistrarImpl, PsiElement> {
-    @Override
-    public CachedValueProvider.Result<MultiHostRegistrarImpl> compute(PsiElement context) {
-      Project project = context.getProject();
-      Pair<PsiElement, PsiElement[]> pair = computeAnchorAndOperands(context);
-      MultiHostRegistrarImpl registrar = doCompute(context, project, pair.first, pair.second);
-      return registrar == null ? null : CachedValueProvider.Result.create(registrar, PsiModificationTracker.MODIFICATION_COUNT, getInstance(project));
-    }
-  }
-
-  private static Pair<PsiElement,PsiElement[]> computeAnchorAndOperands(PsiElement context) {
+  private static Pair<PsiElement,PsiElement[]> computeAnchorAndOperandsImpl(PsiElement context) {
     PsiElement element = context;
     PsiElement parent = context.getParent();
     while (parent instanceof PsiPolyadicExpression && ((PsiPolyadicExpression)parent).getOperationTokenType() == JavaTokenType.PLUS
@@ -130,10 +119,10 @@ public class JavaConcatenationInjectorManager implements ModificationTracker {
   private static final Key<ParameterizedCachedValue<MultiHostRegistrarImpl, PsiElement>> INJECTED_PSI_IN_CONCATENATION = Key.create("INJECTED_PSI_IN_CONCATENATION");
   private static final Key<Integer> NO_CONCAT_INJECTION_TIMESTAMP = Key.create("NO_CONCAT_INJECTION_TIMESTAMP");
 
-  public static class Concatenation2InjectorAdapter implements MultiHostInjector {
+  public static abstract class BaseConcatenation2InjectorAdapter implements MultiHostInjector {
     private final JavaConcatenationInjectorManager myManager;
 
-    public Concatenation2InjectorAdapter(Project project) {
+    public BaseConcatenation2InjectorAdapter(Project project) {
       myManager = getInstance(project);
     }
 
@@ -171,7 +160,16 @@ public class JavaConcatenationInjectorManager implements ModificationTracker {
         if (data == null) {
           CachedValueProvider.Result<MultiHostRegistrarImpl> cachedResult =
             CachedValueProvider.Result.create(result, PsiModificationTracker.MODIFICATION_COUNT, getInstance(project));
-          data = CachedValuesManager.getManager(project).createParameterizedCachedValue(CONCATENATION_PSI_CACHED_VALUE_PROVIDER, false);
+          data = CachedValuesManager.getManager(project).createParameterizedCachedValue(
+            new ParameterizedCachedValueProvider<MultiHostRegistrarImpl, PsiElement>() {
+              @Override
+              public CachedValueProvider.Result<MultiHostRegistrarImpl> compute(PsiElement context) {
+                Project project = context.getProject();
+                Pair<PsiElement, PsiElement[]> pair = computeAnchorAndOperands(context);
+                MultiHostRegistrarImpl registrar = doCompute(context, project, pair.first, pair.second);
+                return registrar == null ? null : CachedValueProvider.Result.create(registrar, PsiModificationTracker.MODIFICATION_COUNT, getInstance(project));
+              }
+            }, false);
           ((PsiParameterizedCachedValue<MultiHostRegistrarImpl, PsiElement>)data).setValue(cachedResult);
 
           anchor.putUserData(INJECTED_PSI_IN_CONCATENATION, data);
@@ -189,6 +187,20 @@ public class JavaConcatenationInjectorManager implements ModificationTracker {
       }
     }
 
+    protected abstract Pair<PsiElement, PsiElement[]>  computeAnchorAndOperands(PsiElement context);
+  }
+
+  public static class Concatenation2InjectorAdapter extends BaseConcatenation2InjectorAdapter implements MultiHostInjector {
+
+    public Concatenation2InjectorAdapter(Project project) {
+      super(project);
+    }
+
+    @Override
+    public Pair<PsiElement, PsiElement[]> computeAnchorAndOperands(PsiElement context) {
+      return computeAnchorAndOperandsImpl(context);
+    }
+
     @Override
     @NotNull
     public List<? extends Class<? extends PsiElement>> elementsToInjectIn() {
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java
index 0f646757406e..ccdc7c33cabb 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java
@@ -27,9 +27,10 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.refactoring.move.MoveCallback;
-import com.intellij.util.ArrayUtil;
+import com.intellij.util.ArrayUtilRt;
 import com.intellij.util.Function;
 import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -81,15 +82,16 @@ public class JavaMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHan
                 PsiElement element = elements[i];
                 if (element instanceof PsiClass) {
                   final PsiClass topLevelClass = PsiUtil.getTopLevelClass(element);
-                  elements[i] = topLevelClass;
-                  final PsiFile containingFile = obtainContainingFile(topLevelClass, elements);
-                  if (containingFile != null && !adjustedElements.contains(containingFile)) {
-                    adjustedElements.add(containingFile);
-                  }
-                }
-                else {
-                  adjustedElements.add(element);
+                  if (topLevelClass != null) {
+                    elements[i] = topLevelClass;
+                    final PsiFile containingFile = obtainContainingFile(topLevelClass, elements);
+                    if (containingFile != null && !adjustedElements.contains(containingFile)) {
+                      adjustedElements.add(containingFile);
+                      continue;
+                    }
+                  } 
                 }
+                adjustedElements.add(element);
               }
               result.setResult(PsiUtilCore.toPsiElementArray(adjustedElements));
             }
@@ -99,11 +101,11 @@ public class JavaMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHan
   }
 
   @Nullable
-  private static PsiFile obtainContainingFile(PsiElement element, PsiElement[] elements) {
+  private static PsiFile obtainContainingFile(@NotNull PsiElement element, PsiElement[] elements) {
     final PsiClass[] classes = ((PsiClassOwner)element.getParent()).getClasses();
     final Set<PsiClass> nonMovedClasses = new HashSet<PsiClass>();
     for (PsiClass aClass : classes) {
-      if (ArrayUtil.find(elements, aClass) < 0) {
+      if (ArrayUtilRt.find(elements, aClass) < 0) {
         nonMovedClasses.add(aClass);
       }
     }
diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMethodProcessor.java
index e4ac3ce780ac..c410d763dac1 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMethodProcessor.java
@@ -209,8 +209,10 @@ public class RenameJavaMethodProcessor extends RenameJavaMemberProcessor {
           final PsiElement element = info.getElement();
           if (element instanceof PsiReferenceExpression) {
             if (((PsiReferenceExpression)element).resolve() == methodToRename) {
+              final PsiElement parent = element.getParent();
+              LOG.assertTrue(parent instanceof PsiMethodCallExpression, parent.getText());
               final PsiMethodCallExpression copy = (PsiMethodCallExpression)JavaPsiFacade.getElementFactory(element.getProject())
-                .createExpressionFromText(element.getParent().getText(), element);
+                .createExpressionFromText(parent.getText(), element);
               final PsiReferenceExpression expression = (PsiReferenceExpression)processRef(copy.getMethodExpression(), newName);
               if (expression == null) continue;
               final JavaResolveResult resolveResult = expression.advancedResolve(true);
diff --git a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
index ccdeb37fd71f..7f8ae6d46b99 100644
--- a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
@@ -113,7 +113,9 @@ public class JavaSafeDeleteProcessor extends SafeDeleteProcessorDelegateBase {
         SuperMethodWarningUtil.checkSuperMethods((PsiMethod)element, RefactoringBundle.message("to.delete.with.usage.search"),
                                                  allElementsToDelete);
       if (methods.length == 0) return null;
-      return Arrays.asList(methods);
+      final ArrayList<PsiMethod> psiMethods = new ArrayList<PsiMethod>(Arrays.asList(methods));
+      psiMethods.add((PsiMethod)element);
+      return psiMethods;
     }
     else if (element instanceof PsiParameter && ((PsiParameter) element).getDeclarationScope() instanceof PsiMethod) {
       PsiMethod method = (PsiMethod) ((PsiParameter) element).getDeclarationScope();
diff --git a/java/java-impl/src/com/intellij/spi/SPIAnnotator.java b/java/java-impl/src/com/intellij/spi/SPIAnnotator.java
index f834542854cb..a1a198408010 100644
--- a/java/java-impl/src/com/intellij/spi/SPIAnnotator.java
+++ b/java/java-impl/src/com/intellij/spi/SPIAnnotator.java
@@ -18,13 +18,12 @@ package com.intellij.spi;
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.Annotator;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.ClassUtil;
 import com.intellij.psi.util.PsiUtilCore;
-import com.intellij.spi.psi.SPIProviderElement;
+import com.intellij.spi.psi.SPIClassProviderReferenceElement;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -42,8 +41,8 @@ public class SPIAnnotator implements Annotator{
         if (psiClass == null) {
           holder.createErrorAnnotation(element, "No service provider \"" + serviceProviderName + "\' found").setFileLevelAnnotation(true);
         }
-      } else if (element instanceof SPIProviderElement) {
-        final PsiElement resolve = ((SPIProviderElement)element).resolve();
+      } else if (element instanceof SPIClassProviderReferenceElement) {
+        final PsiElement resolve = ((SPIClassProviderReferenceElement)element).resolve();
         if (resolve == null) {
           holder.createErrorAnnotation(element, "Cannot resolve symbol " + element.getText());
         } else if (resolve instanceof PsiClass && psiClass != null) {
diff --git a/java/java-impl/src/com/intellij/spi/SPIGotoSuperHandler.java b/java/java-impl/src/com/intellij/spi/SPIGotoSuperHandler.java
index a4a01485313d..04c48bc71e40 100644
--- a/java/java-impl/src/com/intellij/spi/SPIGotoSuperHandler.java
+++ b/java/java-impl/src/com/intellij/spi/SPIGotoSuperHandler.java
@@ -20,7 +20,7 @@ import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiNameIdentifierOwner;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.spi.psi.SPIProviderElement;
+import com.intellij.spi.psi.SPIClassProviderReferenceElement;
 
 /**
  * User: anna
@@ -28,7 +28,8 @@ import com.intellij.spi.psi.SPIProviderElement;
 public class SPIGotoSuperHandler extends JavaGotoSuperHandler {
   @Override
   protected PsiNameIdentifierOwner getElement(PsiFile file, int offset) {
-    final SPIProviderElement providerElement = PsiTreeUtil.getParentOfType(file.findElementAt(offset), SPIProviderElement.class);
+    final SPIClassProviderReferenceElement
+      providerElement = PsiTreeUtil.getParentOfType(file.findElementAt(offset), SPIClassProviderReferenceElement.class);
     if (providerElement != null) {
       return (PsiClass)providerElement.resolve();
     }
diff --git a/java/java-impl/src/com/intellij/spi/parsing/SPIElementTypes.java b/java/java-impl/src/com/intellij/spi/parsing/SPIElementTypes.java
index 228a8459d14f..585e11ecac88 100644
--- a/java/java-impl/src/com/intellij/spi/parsing/SPIElementTypes.java
+++ b/java/java-impl/src/com/intellij/spi/parsing/SPIElementTypes.java
@@ -24,7 +24,8 @@ public interface SPIElementTypes {
 
   IFileElementType FILE = new IFileElementType(SPILanguage.INSTANCE);
   IElementType PROVIDER = new IElementType("PROVIDER", SPILanguage.INSTANCE);
+  IElementType PACK = new IElementType("PACK", SPILanguage.INSTANCE);
 
-  IElementType PROVIDERS_LIST = new IElementType("ROVIDER_LIST", SPILanguage.INSTANCE);
+  IElementType PROVIDERS_LIST = new IElementType("PROVIDER_LIST", SPILanguage.INSTANCE);
   TokenSet PROVIDERS = TokenSet.create(PROVIDER);
 }
diff --git a/java/java-impl/src/com/intellij/spi/parsing/SPIParserDefinition.java b/java/java-impl/src/com/intellij/spi/parsing/SPIParserDefinition.java
index f32bd37a11d9..57b01542ce5e 100644
--- a/java/java-impl/src/com/intellij/spi/parsing/SPIParserDefinition.java
+++ b/java/java-impl/src/com/intellij/spi/parsing/SPIParserDefinition.java
@@ -27,8 +27,9 @@ import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.IFileElementType;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.util.PsiUtilCore;
-import com.intellij.spi.psi.SPIProviderElement;
-import com.intellij.spi.psi.SPIProvidersElementList;
+import com.intellij.spi.psi.SPIClassProviderReferenceElement;
+import com.intellij.spi.psi.SPIClassProvidersElementList;
+import com.intellij.spi.psi.SPIPackageOrClassReferenceElement;
 import com.intellij.spi.psi.SPIFile;
 import com.intellij.lang.spi.SPILanguage;
 import org.jetbrains.annotations.NotNull;
@@ -94,10 +95,13 @@ public class SPIParserDefinition implements ParserDefinition {
   public PsiElement createElement(ASTNode node) {
     final IElementType elementType = node.getElementType();
     if (elementType == SPIElementTypes.PROVIDERS_LIST) {
-      return new SPIProvidersElementList(node);
+      return new SPIClassProvidersElementList(node);
     }
     if (elementType == SPIElementTypes.PROVIDER) {
-      return new SPIProviderElement(node);
+      return new SPIClassProviderReferenceElement(node);
+    }
+    if (elementType == SPIElementTypes.PACK) {
+      return new SPIPackageOrClassReferenceElement(node);
     }
     return PsiUtilCore.NULL_PSI_ELEMENT;
   }
@@ -111,12 +115,12 @@ public class SPIParserDefinition implements ParserDefinition {
   public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) {
     return SpaceRequirements.MAY;
   }
-  
+
   public static void parseProvider(PsiBuilder builder) {
-    if (builder.getTokenType() == JavaTokenType.IDENTIFIER) {
+    if (builder.getTokenType() == SPITokenType.IDENTIFIER) {
       final PsiBuilder.Marker prop = builder.mark();
 
-      parseProviderChar(builder);
+      parseProviderChar(builder, builder.mark());
       prop.done(SPIElementTypes.PROVIDER);
     }
     else {
@@ -125,13 +129,17 @@ public class SPIParserDefinition implements ParserDefinition {
     }
   }
 
-  private static void parseProviderChar(final PsiBuilder builder) {
-    LOG.assertTrue(builder.getTokenType() == JavaTokenType.IDENTIFIER);
+  private static void parseProviderChar(final PsiBuilder builder, PsiBuilder.Marker pack) {
     builder.advanceLexer();
     final IElementType tokenType = builder.getTokenType();
     if (tokenType == JavaTokenType.DOT || tokenType == SPITokenType.DOLLAR) {
+      pack.done(SPIElementTypes.PACK);
       builder.advanceLexer();
-      parseProviderChar(builder);
+      final IElementType initialTokenType = builder.getTokenType();
+      if (initialTokenType == null) return;
+      parseProviderChar(builder, pack.precede());
+    } else {
+      pack.drop();
     }
   }
 }
diff --git a/java/java-impl/src/com/intellij/spi/parsing/SPITokenType.java b/java/java-impl/src/com/intellij/spi/parsing/SPITokenType.java
index cd8b0e6d4e08..a69261439448 100644
--- a/java/java-impl/src/com/intellij/spi/parsing/SPITokenType.java
+++ b/java/java-impl/src/com/intellij/spi/parsing/SPITokenType.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.spi.parsing;
 
+import com.intellij.lang.spi.SPILanguage;
 import com.intellij.psi.JavaTokenType;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.java.IKeywordElementType;
@@ -25,4 +26,5 @@ import com.intellij.psi.tree.java.IKeywordElementType;
 public interface SPITokenType extends JavaTokenType {
   IElementType SHARP = new IKeywordElementType("SHARP");
   IElementType DOLLAR = new IKeywordElementType("DOLLAR");
+  IElementType IDENTIFIER = new IElementType("IDENTIFIER", SPILanguage.INSTANCE);
 }
diff --git a/java/java-impl/src/com/intellij/spi/parsing/_SPILexer.flex b/java/java-impl/src/com/intellij/spi/parsing/_SPILexer.flex
index b49ef5dac14a..9a407038660d 100644
--- a/java/java-impl/src/com/intellij/spi/parsing/_SPILexer.flex
+++ b/java/java-impl/src/com/intellij/spi/parsing/_SPILexer.flex
@@ -45,23 +45,18 @@ import com.intellij.lexer.FlexLexer;
 
 WHITE_SPACE_CHAR=[\ \n\r\t\f]
 
-IDENTIFIER=[:jletter:] [:jletterdigit:]*
+IDENTIFIER=(_|[:letter:]) (_|[:letter:]|[:digit:])*
 
 END_OF_LINE_COMMENT="#"[^\r\n]*
 
-DIGIT = [0-9]
-DIGIT_OR_UNDERSCORE = [_0-9]
-DIGITS = {DIGIT} | {DIGIT} {DIGIT_OR_UNDERSCORE}*
-
 %%
 
-<YYINITIAL> {WHITE_SPACE_CHAR}+ { return JavaTokenType.WHITE_SPACE; }
+<YYINITIAL> {WHITE_SPACE_CHAR}+   { return JavaTokenType.WHITE_SPACE; }
 
 <YYINITIAL> {END_OF_LINE_COMMENT} { return JavaTokenType.END_OF_LINE_COMMENT; }
-<YYINITIAL> {IDENTIFIER} { return JavaTokenType.IDENTIFIER; }
-
-<YYINITIAL> "."   { return JavaTokenType.DOT; }
+<YYINITIAL> "$"                   { return SPITokenType.DOLLAR; }
+<YYINITIAL> {IDENTIFIER}          { return SPITokenType.IDENTIFIER; }
 
-<YYINITIAL> "$" { return SPITokenType.DOLLAR; }
+<YYINITIAL> "."                   { return JavaTokenType.DOT; }
 
-<YYINITIAL> . { return JavaTokenType.BAD_CHARACTER; }
+<YYINITIAL> .                     { return JavaTokenType.BAD_CHARACTER; }
diff --git a/java/java-impl/src/com/intellij/spi/parsing/_SPILexer.java b/java/java-impl/src/com/intellij/spi/parsing/_SPILexer.java
index f08e8b295d1e..c3942d7eede4 100644
--- a/java/java-impl/src/com/intellij/spi/parsing/_SPILexer.java
+++ b/java/java-impl/src/com/intellij/spi/parsing/_SPILexer.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.3 on 6/5/13 9:20 PM */
+/* The following code was generated by JFlex 1.4.3 on 6/10/13 12:01 PM */
 
 /*
  * Copyright 2000-2013 JetBrains s.r.o.
@@ -27,7 +27,7 @@ import com.intellij.lexer.FlexLexer;
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 6/5/13 9:20 PM from the specification file
+ * on 6/10/13 12:01 PM from the specification file
  * <tt>D:/Projects/IDEA.anna/tools/lexer/../../community/java/java-impl/src/com/intellij/spi/parsing/_SPILexer.flex</tt>
  */
 class _SPILexer implements FlexLexer {
@@ -51,90 +51,67 @@ class _SPILexer implements FlexLexer {
    * Translates characters to character classes
    */
   private static final String ZZ_CMAP_PACKED = 
-    "\11\3\1\1\1\5\1\0\1\1\1\5\16\3\4\0\1\1\2\0"+
-    "\1\4\1\2\11\0\1\6\1\0\12\3\7\0\32\2\4\0\1\2"+
-    "\1\0\32\2\4\0\41\3\2\0\4\2\4\0\1\2\2\0\1\3"+
-    "\7\0\1\2\4\0\1\2\5\0\27\2\1\0\37\2\1\0\u013f\2"+
-    "\31\0\162\2\4\0\14\2\16\0\5\2\11\0\1\2\21\0\130\3"+
-    "\5\0\23\3\12\0\1\2\13\0\1\2\1\0\3\2\1\0\1\2"+
-    "\1\0\24\2\1\0\54\2\1\0\46\2\1\0\5\2\4\0\202\2"+
-    "\1\0\4\3\3\0\105\2\1\0\46\2\2\0\2\2\6\0\20\2"+
-    "\41\0\46\2\2\0\1\2\7\0\47\2\11\0\21\3\1\0\27\3"+
-    "\1\0\3\3\1\0\1\3\1\0\2\3\1\0\1\3\13\0\33\2"+
-    "\5\0\3\2\15\0\4\3\14\0\6\3\13\0\32\2\5\0\13\2"+
-    "\16\3\7\0\12\3\4\0\2\2\1\3\143\2\1\0\1\2\10\3"+
-    "\1\0\6\3\2\2\2\3\1\0\4\3\2\2\12\3\3\2\2\0"+
-    "\1\2\17\0\1\3\1\2\1\3\36\2\33\3\2\0\3\2\60\0"+
-    "\46\2\13\3\1\2\u014f\0\3\3\66\2\2\0\1\3\1\2\20\3"+
-    "\2\0\1\2\4\3\3\0\12\2\2\3\2\0\12\3\21\0\3\3"+
-    "\1\0\10\2\2\0\2\2\2\0\26\2\1\0\7\2\1\0\1\2"+
-    "\3\0\4\2\2\0\1\3\1\2\7\3\2\0\2\3\2\0\3\3"+
-    "\11\0\1\3\4\0\2\2\1\0\3\2\2\3\2\0\12\3\4\2"+
-    "\15\0\3\3\1\0\6\2\4\0\2\2\2\0\26\2\1\0\7\2"+
-    "\1\0\2\2\1\0\2\2\1\0\2\2\2\0\1\3\1\0\5\3"+
-    "\4\0\2\3\2\0\3\3\13\0\4\2\1\0\1\2\7\0\14\3"+
-    "\3\2\14\0\3\3\1\0\11\2\1\0\3\2\1\0\26\2\1\0"+
-    "\7\2\1\0\2\2\1\0\5\2\2\0\1\3\1\2\10\3\1\0"+
-    "\3\3\1\0\3\3\2\0\1\2\17\0\2\2\2\3\2\0\12\3"+
-    "\1\0\1\2\17\0\3\3\1\0\10\2\2\0\2\2\2\0\26\2"+
-    "\1\0\7\2\1\0\2\2\1\0\5\2\2\0\1\3\1\2\6\3"+
-    "\3\0\2\3\2\0\3\3\10\0\2\3\4\0\2\2\1\0\3\2"+
-    "\4\0\12\3\1\0\1\2\20\0\1\3\1\2\1\0\6\2\3\0"+
-    "\3\2\1\0\4\2\3\0\2\2\1\0\1\2\1\0\2\2\3\0"+
-    "\2\2\3\0\3\2\3\0\10\2\1\0\3\2\4\0\5\3\3\0"+
-    "\3\3\1\0\4\3\11\0\1\3\17\0\11\3\11\0\1\2\7\0"+
-    "\3\3\1\0\10\2\1\0\3\2\1\0\27\2\1\0\12\2\1\0"+
-    "\5\2\4\0\7\3\1\0\3\3\1\0\4\3\7\0\2\3\11\0"+
-    "\2\2\4\0\12\3\22\0\2\3\1\0\10\2\1\0\3\2\1\0"+
-    "\27\2\1\0\12\2\1\0\5\2\2\0\1\3\1\2\7\3\1\0"+
-    "\3\3\1\0\4\3\7\0\2\3\7\0\1\2\1\0\2\2\4\0"+
-    "\12\3\22\0\2\3\1\0\10\2\1\0\3\2\1\0\27\2\1\0"+
-    "\20\2\4\0\6\3\2\0\3\3\1\0\4\3\11\0\1\3\10\0"+
-    "\2\2\4\0\12\3\22\0\2\3\1\0\22\2\3\0\30\2\1\0"+
-    "\11\2\1\0\1\2\2\0\7\2\3\0\1\3\4\0\6\3\1\0"+
-    "\1\3\1\0\10\3\22\0\2\3\15\0\60\2\1\3\2\2\7\3"+
-    "\4\0\10\2\10\3\1\0\12\3\47\0\2\2\1\0\1\2\2\0"+
-    "\2\2\1\0\1\2\2\0\1\2\6\0\4\2\1\0\7\2\1\0"+
-    "\3\2\1\0\1\2\1\0\1\2\2\0\2\2\1\0\4\2\1\3"+
-    "\2\2\6\3\1\0\2\3\1\2\2\0\5\2\1\0\1\2\1\0"+
-    "\6\3\2\0\12\3\2\0\2\2\42\0\1\2\27\0\2\3\6\0"+
-    "\12\3\13\0\1\3\1\0\1\3\1\0\1\3\4\0\2\3\10\2"+
-    "\1\0\42\2\6\0\24\3\1\0\2\3\4\2\4\0\10\3\1\0"+
-    "\44\3\11\0\1\3\71\0\42\2\1\0\5\2\1\0\2\2\1\0"+
-    "\7\3\3\0\4\3\6\0\12\3\6\0\6\2\4\3\106\0\46\2"+
-    "\12\0\51\2\7\0\132\2\5\0\104\2\5\0\122\2\6\0\7\2"+
-    "\1\0\77\2\1\0\1\2\1\0\4\2\2\0\7\2\1\0\1\2"+
-    "\1\0\4\2\2\0\47\2\1\0\1\2\1\0\4\2\2\0\37\2"+
-    "\1\0\1\2\1\0\4\2\2\0\7\2\1\0\1\2\1\0\4\2"+
-    "\2\0\7\2\1\0\7\2\1\0\27\2\1\0\37\2\1\0\1\2"+
-    "\1\0\4\2\2\0\7\2\1\0\47\2\1\0\23\2\16\0\11\3"+
-    "\56\0\125\2\14\0\u026c\2\2\0\10\2\12\0\32\2\5\0\113\2"+
-    "\3\0\3\2\17\0\15\2\1\0\4\2\3\3\13\0\22\2\3\3"+
-    "\13\0\22\2\2\3\14\0\15\2\1\0\3\2\1\0\2\3\14\0"+
-    "\64\2\40\3\3\0\1\2\3\0\2\2\1\3\2\0\12\3\41\0"+
-    "\3\3\2\0\12\3\6\0\130\2\10\0\51\2\1\3\126\0\35\2"+
-    "\3\0\14\3\4\0\14\3\12\0\12\3\36\2\2\0\5\2\u038b\0"+
+    "\11\0\1\1\1\5\1\0\1\1\1\5\22\0\1\1\2\0\1\4"+
+    "\1\6\11\0\1\7\1\0\12\3\7\0\32\2\4\0\1\2\1\0"+
+    "\32\2\57\0\1\2\12\0\1\2\4\0\1\2\5\0\27\2\1\0"+
+    "\37\2\1\0\u013f\2\31\0\162\2\4\0\14\2\16\0\5\2\11\0"+
+    "\1\2\213\0\1\2\13\0\1\2\1\0\3\2\1\0\1\2\1\0"+
+    "\24\2\1\0\54\2\1\0\46\2\1\0\5\2\4\0\202\2\10\0"+
+    "\105\2\1\0\46\2\2\0\2\2\6\0\20\2\41\0\46\2\2\0"+
+    "\1\2\7\0\47\2\110\0\33\2\5\0\3\2\56\0\32\2\5\0"+
+    "\13\2\25\0\12\3\4\0\2\2\1\0\143\2\1\0\1\2\17\0"+
+    "\2\2\7\0\2\2\12\3\3\2\2\0\1\2\20\0\1\2\1\0"+
+    "\36\2\35\0\3\2\60\0\46\2\13\0\1\2\u0152\0\66\2\3\0"+
+    "\1\2\22\0\1\2\7\0\12\2\4\0\12\3\25\0\10\2\2\0"+
+    "\2\2\2\0\26\2\1\0\7\2\1\0\1\2\3\0\4\2\3\0"+
+    "\1\2\36\0\2\2\1\0\3\2\4\0\12\3\2\2\23\0\6\2"+
+    "\4\0\2\2\2\0\26\2\1\0\7\2\1\0\2\2\1\0\2\2"+
+    "\1\0\2\2\37\0\4\2\1\0\1\2\7\0\12\3\2\0\3\2"+
+    "\20\0\11\2\1\0\3\2\1\0\26\2\1\0\7\2\1\0\2\2"+
+    "\1\0\5\2\3\0\1\2\22\0\1\2\17\0\2\2\4\0\12\3"+
+    "\25\0\10\2\2\0\2\2\2\0\26\2\1\0\7\2\1\0\2\2"+
+    "\1\0\5\2\3\0\1\2\36\0\2\2\1\0\3\2\4\0\12\3"+
+    "\1\0\1\2\21\0\1\2\1\0\6\2\3\0\3\2\1\0\4\2"+
+    "\3\0\2\2\1\0\1\2\1\0\2\2\3\0\2\2\3\0\3\2"+
+    "\3\0\10\2\1\0\3\2\55\0\11\3\25\0\10\2\1\0\3\2"+
+    "\1\0\27\2\1\0\12\2\1\0\5\2\46\0\2\2\4\0\12\3"+
+    "\25\0\10\2\1\0\3\2\1\0\27\2\1\0\12\2\1\0\5\2"+
+    "\3\0\1\2\40\0\1\2\1\0\2\2\4\0\12\3\25\0\10\2"+
+    "\1\0\3\2\1\0\27\2\1\0\20\2\46\0\2\2\4\0\12\3"+
+    "\25\0\22\2\3\0\30\2\1\0\11\2\1\0\1\2\2\0\7\2"+
+    "\72\0\60\2\1\0\2\2\14\0\7\2\11\0\12\3\47\0\2\2"+
+    "\1\0\1\2\2\0\2\2\1\0\1\2\2\0\1\2\6\0\4\2"+
+    "\1\0\7\2\1\0\3\2\1\0\1\2\1\0\1\2\2\0\2\2"+
+    "\1\0\4\2\1\0\2\2\11\0\1\2\2\0\5\2\1\0\1\2"+
+    "\11\0\12\3\2\0\2\2\42\0\1\2\37\0\12\3\26\0\10\2"+
+    "\1\0\42\2\35\0\4\2\164\0\42\2\1\0\5\2\1\0\2\2"+
+    "\25\0\12\3\6\0\6\2\112\0\46\2\12\0\51\2\7\0\132\2"+
+    "\5\0\104\2\5\0\122\2\6\0\7\2\1\0\77\2\1\0\1\2"+
+    "\1\0\4\2\2\0\7\2\1\0\1\2\1\0\4\2\2\0\47\2"+
+    "\1\0\1\2\1\0\4\2\2\0\37\2\1\0\1\2\1\0\4\2"+
+    "\2\0\7\2\1\0\1\2\1\0\4\2\2\0\7\2\1\0\7\2"+
+    "\1\0\27\2\1\0\37\2\1\0\1\2\1\0\4\2\2\0\7\2"+
+    "\1\0\47\2\1\0\23\2\16\0\11\3\56\0\125\2\14\0\u026c\2"+
+    "\2\0\10\2\12\0\32\2\5\0\113\2\25\0\15\2\1\0\4\2"+
+    "\16\0\22\2\16\0\22\2\16\0\15\2\1\0\3\2\17\0\64\2"+
+    "\43\0\1\2\4\0\1\2\3\0\12\3\46\0\12\3\6\0\130\2"+
+    "\10\0\51\2\127\0\35\2\51\0\12\3\36\2\2\0\5\2\u038b\0"+
     "\154\2\224\0\234\2\4\0\132\2\6\0\26\2\2\0\6\2\2\0"+
     "\46\2\2\0\6\2\2\0\10\2\1\0\1\2\1\0\1\2\1\0"+
     "\1\2\1\0\37\2\2\0\65\2\1\0\7\2\1\0\1\2\3\0"+
     "\3\2\1\0\7\2\3\0\4\2\2\0\6\2\4\0\15\2\5\0"+
-    "\3\2\1\0\7\2\17\0\4\3\32\0\5\3\20\0\2\2\23\0"+
-    "\1\2\13\0\4\3\6\0\6\3\1\0\1\2\15\0\1\2\40\0"+
-    "\22\2\36\0\15\3\4\0\1\3\3\0\6\3\27\0\1\2\4\0"+
+    "\3\2\1\0\7\2\164\0\1\2\15\0\1\2\202\0\1\2\4\0"+
     "\1\2\2\0\12\2\1\0\1\2\3\0\5\2\6\0\1\2\1\0"+
     "\1\2\1\0\1\2\1\0\4\2\1\0\3\2\1\0\7\2\3\0"+
-    "\3\2\5\0\5\2\26\0\44\2\u0e81\0\3\2\31\0\11\2\6\3"+
-    "\1\0\5\2\2\0\5\2\4\0\126\2\2\0\2\3\2\0\3\2"+
-    "\1\0\137\2\5\0\50\2\4\0\136\2\21\0\30\2\70\0\20\2"+
-    "\u0200\0\u19b6\2\112\0\u51a6\2\132\0\u048d\2\u0773\0\u2ba4\2\u215c\0\u012e\2"+
-    "\2\0\73\2\225\0\7\2\14\0\5\2\5\0\1\2\1\3\12\2"+
-    "\1\0\15\2\1\0\5\2\1\0\1\2\1\0\2\2\1\0\2\2"+
-    "\1\0\154\2\41\0\u016b\2\22\0\100\2\2\0\66\2\50\0\15\2"+
-    "\3\0\20\3\20\0\4\3\17\0\2\2\30\0\3\2\31\0\1\2"+
-    "\6\0\5\2\1\0\207\2\2\0\1\3\4\0\1\2\13\0\12\3"+
-    "\7\0\32\2\4\0\1\2\1\0\32\2\12\0\132\2\3\0\6\2"+
-    "\2\0\6\2\2\0\6\2\2\0\3\2\3\0\2\2\3\0\2\2"+
-    "\22\0\3\3\4\0";
+    "\3\2\5\0\5\2\u0ebb\0\2\2\52\0\5\2\5\0\2\2\4\0"+
+    "\126\2\6\0\3\2\1\0\132\2\1\0\4\2\5\0\50\2\4\0"+
+    "\136\2\21\0\30\2\70\0\20\2\u0200\0\u19b6\2\112\0\u51a6\2\132\0"+
+    "\u048d\2\u0773\0\u2ba4\2\u215c\0\u012e\2\2\0\73\2\225\0\7\2\14\0"+
+    "\5\2\5\0\1\2\1\0\12\2\1\0\15\2\1\0\5\2\1\0"+
+    "\1\2\1\0\2\2\1\0\2\2\1\0\154\2\41\0\u016b\2\22\0"+
+    "\100\2\2\0\66\2\50\0\14\2\164\0\5\2\1\0\207\2\23\0"+
+    "\12\3\7\0\32\2\6\0\32\2\13\0\131\2\3\0\6\2\2\0"+
+    "\6\2\2\0\6\2\2\0\3\2\43\0";
 
   /** 
    * Translates characters to character classes
@@ -147,10 +124,10 @@ class _SPILexer implements FlexLexer {
   private static final int [] ZZ_ACTION = zzUnpackAction();
 
   private static final String ZZ_ACTION_PACKED_0 =
-    "\1\0\1\1\1\2\1\3\1\4\1\5";
+    "\1\0\1\1\1\2\1\3\1\4\1\5\1\6";
 
   private static int [] zzUnpackAction() {
-    int [] result = new int[6];
+    int [] result = new int[7];
     int offset = 0;
     offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
     return result;
@@ -175,10 +152,10 @@ class _SPILexer implements FlexLexer {
   private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
 
   private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\7\0\16\0\25\0\34\0\7";
+    "\0\0\0\10\0\20\0\30\0\40\0\10\0\10";
 
   private static int [] zzUnpackRowMap() {
-    int [] result = new int[6];
+    int [] result = new int[7];
     int offset = 0;
     offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
     return result;
@@ -201,12 +178,12 @@ class _SPILexer implements FlexLexer {
   private static final int [] ZZ_TRANS = zzUnpackTrans();
 
   private static final String ZZ_TRANS_PACKED_0 =
-    "\1\2\1\3\1\4\1\2\1\5\1\3\1\6\10\0"+
-    "\1\3\3\0\1\3\3\0\2\4\3\0\5\5\1\0"+
-    "\1\5";
+    "\1\2\1\3\1\4\1\2\1\5\1\3\1\6\1\7"+
+    "\11\0\1\3\3\0\1\3\4\0\2\4\4\0\5\5"+
+    "\1\0\2\5";
 
   private static int [] zzUnpackTrans() {
-    int [] result = new int[35];
+    int [] result = new int[40];
     int offset = 0;
     offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
     return result;
@@ -247,10 +224,10 @@ class _SPILexer implements FlexLexer {
   private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
 
   private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\1\0\1\11\3\1\1\11";
+    "\1\0\1\11\3\1\2\11";
 
   private static int [] zzUnpackAttribute() {
-    int [] result = new int[6];
+    int [] result = new int[7];
     int offset = 0;
     offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
     return result;
@@ -344,7 +321,7 @@ class _SPILexer implements FlexLexer {
     char [] map = new char[0x10000];
     int i = 0;  /* index in packed string  */
     int j = 0;  /* index in unpacked array */
-    while (i < 1666) {
+    while (i < 1212) {
       int  count = packed.charAt(i++);
       char value = packed.charAt(i++);
       do map[j++] = value; while (--count > 0);
@@ -569,23 +546,27 @@ class _SPILexer implements FlexLexer {
         case 2: 
           { return JavaTokenType.WHITE_SPACE;
           }
-        case 6: break;
-        case 5: 
-          { return JavaTokenType.DOT;
-          }
         case 7: break;
         case 3: 
-          { return JavaTokenType.IDENTIFIER;
+          { return SPITokenType.IDENTIFIER;
           }
         case 8: break;
+        case 6: 
+          { return JavaTokenType.DOT;
+          }
+        case 9: break;
+        case 5: 
+          { return SPITokenType.DOLLAR;
+          }
+        case 10: break;
         case 4: 
           { return JavaTokenType.END_OF_LINE_COMMENT;
           }
-        case 9: break;
+        case 11: break;
         case 1: 
           { return JavaTokenType.BAD_CHARACTER;
           }
-        case 10: break;
+        case 12: break;
         default:
           if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
             zzAtEOF = true;
diff --git a/java/java-impl/src/com/intellij/spi/psi/SPIClassProviderReferenceElement.java b/java/java-impl/src/com/intellij/spi/psi/SPIClassProviderReferenceElement.java
new file mode 100644
index 000000000000..7d9fc0218be5
--- /dev/null
+++ b/java/java-impl/src/com/intellij/spi/psi/SPIClassProviderReferenceElement.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2000-2013 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.spi.psi;
+
+import com.intellij.codeInsight.lookup.LookupElementBuilder;
+import com.intellij.lang.ASTNode;
+import com.intellij.psi.*;
+import com.intellij.psi.search.searches.ClassInheritorsSearch;
+import com.intellij.psi.util.ClassUtil;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.Processor;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * User: anna
+ */
+public class SPIClassProviderReferenceElement extends SPIPackageOrClassReferenceElement {
+  public SPIClassProviderReferenceElement(ASTNode node) {
+    super(node);
+  }
+
+  @NotNull
+  @Override
+  public Object[] getVariants() {
+    final String name = getContainingFile().getName();
+    final PsiClass superProvider = JavaPsiFacade.getInstance(getProject()).findClass(name, getResolveScope());
+    if (superProvider != null) {
+      final List<Object> result = new ArrayList<Object>();
+      ClassInheritorsSearch.search(superProvider).forEach(new Processor<PsiClass>() {
+        @Override
+        public boolean process(PsiClass psiClass) {
+          final String jvmClassName = ClassUtil.getJVMClassName(psiClass);
+          if (jvmClassName != null) {
+            result.add(LookupElementBuilder.create(psiClass, jvmClassName));
+          }
+          return false;
+        }
+      });
+      return ArrayUtil.toObjectArray(result);
+    }
+    return ArrayUtil.EMPTY_OBJECT_ARRAY;
+  }
+}
diff --git a/java/java-impl/src/com/intellij/spi/psi/SPIProvidersElementList.java b/java/java-impl/src/com/intellij/spi/psi/SPIClassProvidersElementList.java
index 75cc44cb700f..90a06015dbaf 100644
--- a/java/java-impl/src/com/intellij/spi/psi/SPIProvidersElementList.java
+++ b/java/java-impl/src/com/intellij/spi/psi/SPIClassProvidersElementList.java
@@ -17,7 +17,6 @@ package com.intellij.spi.psi;
 
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import com.intellij.lang.ASTNode;
-import com.intellij.spi.parsing.SPIElementType;
 import com.intellij.spi.parsing.SPIElementTypes;
 import org.jetbrains.annotations.NotNull;
 
@@ -26,12 +25,12 @@ import java.util.List;
 /**
  * User: anna
  */
-public class SPIProvidersElementList extends ASTWrapperPsiElement {
-  public SPIProvidersElementList(@NotNull ASTNode node) {
+public class SPIClassProvidersElementList extends ASTWrapperPsiElement {
+  public SPIClassProvidersElementList(@NotNull ASTNode node) {
     super(node);
   }
   
-  public List<SPIProviderElement> getElements() {
+  public List<SPIClassProviderReferenceElement> getElements() {
     return findChildrenByType(SPIElementTypes.PROVIDER);
   }
 }
diff --git a/java/java-impl/src/com/intellij/spi/psi/SPIFile.java b/java/java-impl/src/com/intellij/spi/psi/SPIFile.java
index 9f1e8106878a..a3858c50ccb3 100644
--- a/java/java-impl/src/com/intellij/spi/psi/SPIFile.java
+++ b/java/java-impl/src/com/intellij/spi/psi/SPIFile.java
@@ -29,6 +29,9 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * User: anna
  */
@@ -49,6 +52,35 @@ public class SPIFile extends PsiFileBase {
 
   @NotNull
   @Override
+  public PsiReference[] getReferences() {
+    final List<PsiReference> refs = new ArrayList<PsiReference>();
+    int idx = 0;
+    int d;
+    final String fileName = getName();
+    while ((d = fileName.indexOf(".", idx)) > -1) {
+      final PsiPackage aPackage = JavaPsiFacade.getInstance(getProject()).findPackage(fileName.substring(0, d));
+      if (aPackage != null) {
+        refs.add(new SPIFileName2PackageReference(this, aPackage));
+      }
+      idx = d + 1;
+    }
+    final PsiReference reference = getReference();
+    PsiElement resolve = reference.resolve();
+    while (resolve instanceof PsiClass) {
+      resolve = ((PsiClass)resolve).getContainingClass();
+      if (resolve != null) {
+        final String jvmClassName = ClassUtil.getJVMClassName((PsiClass)resolve);
+        if (jvmClassName != null) {
+          refs.add(new SPIFileName2PackageReference(this, resolve));
+        }
+      }
+    }
+    refs.add(reference);
+    return refs.toArray(new PsiReference[refs.size()]);
+  }
+
+  @NotNull
+  @Override
   public FileType getFileType() {
     return SPIFileType.INSTANCE;
   }
@@ -69,10 +101,12 @@ public class SPIFile extends PsiFileBase {
 
     @Override
     public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
-      final String className = ClassUtil.getJVMClassName(myClass);
-      if (className != null) {
-        final String newFileName = className.substring(0, className.lastIndexOf(myClass.getName())) + newElementName;
-        return getElement().setName(newFileName);
+      if (myClass != null) {
+        final String className = ClassUtil.getJVMClassName(myClass);
+        if (className != null) {
+          final String newFileName = className.substring(0, className.lastIndexOf(myClass.getName())) + newElementName;
+          return getElement().setName(newFileName);
+        }
       }
       return getElement();
     }
@@ -94,4 +128,50 @@ public class SPIFile extends PsiFileBase {
       return ArrayUtil.EMPTY_OBJECT_ARRAY;
     }
   }
+
+  private static class SPIFileName2PackageReference extends PsiReferenceBase<PsiFile> {
+    private final PsiElement myPackageOrContainingClass;
+
+    public SPIFileName2PackageReference(PsiFile file, @NotNull PsiElement psiPackage) {
+      super(file, new TextRange(0, 0), false);
+      myPackageOrContainingClass = psiPackage;
+    }
+
+    @NotNull
+    @Override
+    public String getCanonicalText() {
+      return myPackageOrContainingClass instanceof PsiPackage 
+             ? ((PsiPackage)myPackageOrContainingClass).getQualifiedName() : ClassUtil.getJVMClassName((PsiClass)myPackageOrContainingClass);
+    }
+
+    @Nullable
+    @Override
+    public PsiElement resolve() {
+      return myPackageOrContainingClass;
+    }
+
+    @Override
+    public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
+      return getElement().setName(newElementName + getElement().getName().substring(getCanonicalText().length()));
+    }
+
+    @Override
+    public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException {
+      if (element instanceof PsiPackage) {
+        return handleElementRename(((PsiPackage)element).getQualifiedName());
+      } else if (element instanceof PsiClass) {
+        final String className = ClassUtil.getJVMClassName((PsiClass)element);
+        if (className != null) {
+          return handleElementRename(className);
+        }
+      }
+      return getElement();
+    }
+
+    @NotNull
+    @Override
+    public Object[] getVariants() {
+      return ArrayUtil.EMPTY_OBJECT_ARRAY;
+    }
+  }
 }
diff --git a/java/java-impl/src/com/intellij/spi/psi/SPIProviderElement.java b/java/java-impl/src/com/intellij/spi/psi/SPIPackageOrClassReferenceElement.java
index 17c47b0ffbcc..fa78a2ebc69c 100644
--- a/java/java-impl/src/com/intellij/spi/psi/SPIProviderElement.java
+++ b/java/java-impl/src/com/intellij/spi/psi/SPIPackageOrClassReferenceElement.java
@@ -19,9 +19,8 @@ import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
-import com.intellij.psi.infos.ClassCandidateInfo;
-import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.util.ClassUtil;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.spi.SPIFileType;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
@@ -31,49 +30,20 @@ import org.jetbrains.annotations.Nullable;
 /**
  * User: anna
  */
-public class SPIProviderElement extends ASTWrapperPsiElement implements PsiJavaReference {
-  public SPIProviderElement(ASTNode node) {
+public class SPIPackageOrClassReferenceElement extends ASTWrapperPsiElement implements PsiReference {
+  public SPIPackageOrClassReferenceElement(@NotNull ASTNode node) {
     super(node);
   }
 
   @Override
-  public void processVariants(PsiScopeProcessor processor) {
-  }
-
-  @NotNull
-  @Override
-  public JavaResolveResult advancedResolve(boolean incompleteCode) {
-    final PsiElement resolve = resolve();
-    if (resolve instanceof PsiClass) {
-      return new ClassCandidateInfo(resolve, PsiSubstitutor.EMPTY);
-    }
-    return JavaResolveResult.EMPTY;
-  }
-
-  @NotNull
-  @Override
-  public JavaResolveResult[] multiResolve(boolean incompleteCode) {
-    final PsiElement resolve = resolve();
-    if (resolve instanceof PsiClass) {
-      return new JavaResolveResult[]{new ClassCandidateInfo(resolve, PsiSubstitutor.EMPTY)};
-    }
-    return JavaResolveResult.EMPTY_ARRAY;
-  }
-
-  @Override
   public PsiElement getElement() {
     return this;
   }
 
   @Override
   public TextRange getRangeInElement() {
-    return new TextRange(0, getTextLength());
-  }
-
-  @Nullable
-  @Override
-  public PsiElement resolve() {
-    return ClassUtil.findPsiClass(getManager(), getText(), null, true, getResolveScope());
+    final PsiElement last = PsiTreeUtil.getDeepestLast(this);
+    return new TextRange(last.getStartOffsetInParent(), getTextLength());
   }
 
   @NotNull
@@ -84,35 +54,46 @@ public class SPIProviderElement extends ASTWrapperPsiElement implements PsiJavaR
 
   @Override
   public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
-    final SPIProvidersElementList firstChild =
-      (SPIProvidersElementList)PsiFileFactory.getInstance(getProject())
+    final SPIClassProvidersElementList firstChild =
+      (SPIClassProvidersElementList)PsiFileFactory.getInstance(getProject())
         .createFileFromText("spi_dummy", SPIFileType.INSTANCE, newElementName).getFirstChild();
     return replace(firstChild.getElements().get(0));
   }
 
+  @Nullable
+  @Override
+  public PsiElement resolve() {
+    PsiPackage aPackage = JavaPsiFacade.getInstance(getProject()).findPackage(getText());
+    if (aPackage != null) {
+      return aPackage;
+    }
+    return ClassUtil.findPsiClass(getManager(), getText(), null, true, getResolveScope());
+  }
+
   @Override
   public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException {
-    if (element instanceof PsiClass) {
+    if (element instanceof PsiPackage) {
+      return handleElementRename(((PsiPackage)element).getQualifiedName());
+    } else if (element instanceof PsiClass) {
       final String className = ClassUtil.getJVMClassName((PsiClass)element);
-      if (className != null) {
-        return handleElementRename(className);
-      }
+      return className != null ? handleElementRename(className) : null;
     }
     return null;
   }
 
   @Override
   public boolean isReferenceTo(PsiElement element) {
-    if (element instanceof PsiClass) {
+    if (element instanceof PsiPackage) {
+      return getText().equals(((PsiPackage)element).getQualifiedName());
+    } else if (element instanceof PsiClass) {
       return getText().equals(ClassUtil.getJVMClassName((PsiClass)element));
     }
     return false;
   }
 
-  @NotNull
   @Override
-  public Object[] getVariants() {
-    return ArrayUtil.EMPTY_OBJECT_ARRAY;
+  public boolean isSoft() {
+    return false;
   }
 
   @Override
@@ -120,8 +101,9 @@ public class SPIProviderElement extends ASTWrapperPsiElement implements PsiJavaR
     return this;
   }
 
+  @NotNull
   @Override
-  public boolean isSoft() {
-    return false;
+  public Object[] getVariants() {
+    return ArrayUtil.EMPTY_OBJECT_ARRAY;
   }
 }