CodeInsight fixture to use find usages options from handler

This commit is contained in:
Roman Shevchenko
2010-04-23 14:17:16 +04:00
parent e6d551ec06
commit dd03a78a0d
2 changed files with 2 additions and 15 deletions
@@ -273,9 +273,6 @@ public interface CodeInsightTestFixture extends IdeaProjectTestFixture {
void testRename(String fileAfter, String newName) throws Exception;
@NotNull
FindUsagesOptions getFindUsagesOptions();
Collection<UsageInfo> testFindUsages(@TestDataFile @NonNls String... fileNames);
Collection<UsageInfo> findUsages(final PsiElement to) throws Exception;
@@ -141,8 +141,6 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
private PsiElement myFileContext;
private final FileTreeAccessFilter myJavaFilesFilter = new FileTreeAccessFilter();
private FindUsagesOptions myFindUsagesOptions;
public CodeInsightTestFixtureImpl(IdeaProjectTestFixture projectFixture, TempDirTestFixture tempDirTestFixture) {
myProjectFixture = projectFixture;
myTempDirFixture = tempDirTestFixture;
@@ -585,15 +583,6 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
actionManager.getActionHandler(actionId).execute(getEditor(), dataContext);
}
@NotNull
public FindUsagesOptions getFindUsagesOptions() {
if (myFindUsagesOptions == null) {
myFindUsagesOptions = new FindUsagesOptions(getProject(), null);
myFindUsagesOptions.isUsages = myFindUsagesOptions.isReadAccess = myFindUsagesOptions.isWriteAccess = true;
}
return myFindUsagesOptions;
}
public Collection<UsageInfo> testFindUsages(@NonNls final String... fileNames) {
assertInitialized();
configureByFiles(fileNames);
@@ -610,8 +599,9 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
final CommonProcessors.CollectProcessor<UsageInfo> processor = new CommonProcessors.CollectProcessor<UsageInfo>();
assert handler != null : "Cannot find handler for: " + targetElement;
final PsiElement[] psiElements = ArrayUtil.mergeArrays(handler.getPrimaryElements(), handler.getSecondaryElements(), PsiElement.class);
final FindUsagesOptions options = handler.getFindUsagesOptions();
for (PsiElement psiElement : psiElements) {
handler.processElementUsages(psiElement, processor, getFindUsagesOptions());
handler.processElementUsages(psiElement, processor, options);
}
return processor.getResults();
}