mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
consistent search scope when resolving plugin classes from plugin.xml [r=peter]
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user