From 4901d7676c323f4296e0ecd67deb4afd768a06d8 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 20 Feb 2015 18:15:52 +0100 Subject: [PATCH] register MethodsSuperSearch in JavaCoreEnvironment --- .../com/intellij/core/JavaCoreApplicationEnvironment.java | 7 ++++++- .../com/intellij/psi/impl/search/MethodSuperSearcher.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) rename java/{java-indexing-impl => java-psi-impl}/src/com/intellij/psi/impl/search/MethodSuperSearcher.java (99%) diff --git a/java/java-psi-impl/src/com/intellij/core/JavaCoreApplicationEnvironment.java b/java/java-psi-impl/src/com/intellij/core/JavaCoreApplicationEnvironment.java index 8311ec0b199a..e4a4add097d0 100644 --- a/java/java-psi-impl/src/com/intellij/core/JavaCoreApplicationEnvironment.java +++ b/java/java-psi-impl/src/com/intellij/core/JavaCoreApplicationEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 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,10 +41,13 @@ import com.intellij.psi.impl.LanguageConstantExpressionEvaluator; import com.intellij.psi.impl.PsiExpressionEvaluator; import com.intellij.psi.impl.compiled.ClassFileStubBuilder; import com.intellij.psi.impl.file.PsiPackageImplementationHelper; +import com.intellij.psi.impl.search.MethodSuperSearcher; import com.intellij.psi.impl.source.tree.CoreJavaASTFactory; import com.intellij.psi.impl.source.tree.PlainTextASTFactory; import com.intellij.psi.presentation.java.*; +import com.intellij.psi.search.searches.SuperMethodsSearch; import com.intellij.psi.stubs.BinaryFileStubBuilders; +import com.intellij.util.QueryExecutor; import org.jetbrains.annotations.NotNull; /** @@ -98,6 +101,8 @@ public class JavaCoreApplicationEnvironment extends CoreApplicationEnvironment { } }); + registerApplicationExtensionPoint(SuperMethodsSearch.EP_NAME, QueryExecutor.class); + addExtension(SuperMethodsSearch.EP_NAME, new MethodSuperSearcher()); } @SuppressWarnings("MethodMayBeStatic") // overridden in upsource diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java b/java/java-psi-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java similarity index 99% rename from java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java rename to java/java-psi-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java index acb5faae4947..d19b54fdd75c 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/search/MethodSuperSearcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 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.