From 146b070eea345c5ce6592ee089eeed9111bd0206 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 12 Feb 2013 19:06:27 +0100
Subject: [PATCH] consistent search scope when resolving plugin classes from
 plugin.xml [r=peter]

---
 .../src/com/intellij/util/xml/PsiClassConverter.java  | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/java/java-impl/src/com/intellij/util/xml/PsiClassConverter.java b/java/java-impl/src/com/intellij/util/xml/PsiClassConverter.java
index a5b0cf2698c3..d4f579084216 100644
--- a/java/java-impl/src/com/intellij/util/xml/PsiClassConverter.java
+++ b/java/java-impl/src/com/intellij/util/xml/PsiClassConverter.java
@@ -16,15 +16,10 @@
 
 package com.intellij.util.xml;
 
-import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ProjectFileIndex;
-import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.JavaClassReferenceProvider;
 import com.intellij.psi.search.GlobalSearchScope;
@@ -38,12 +33,8 @@ import org.jetbrains.annotations.Nullable;
 public class PsiClassConverter extends Converter<PsiClass> implements CustomReferenceConverter<PsiClass> {
 
   public PsiClass fromString(final String s, final ConvertContext context) {
-    return findClass(s, context);
-  }
-
-  public static PsiClass findClass(String s, ConvertContext context) {
     final DomElement element = context.getInvocationElement();
-    final GlobalSearchScope scope = element instanceof GenericDomValue ? context.getSearchScope() : null;
+    final GlobalSearchScope scope = element instanceof GenericDomValue ? getScope(context) : null;
     return DomJavaUtil.findClass(s, context.getFile(), context.getModule(), scope);
   }