MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IdeaPluginConverter#getAllPlugins: get rid of isIdeaProject() call

Browse Source 
(DOM stubs interfering)
This commit is contained in:
Yann Cébron
2014-05-06 15:35:19 +02:00
parent 87b041d9db
commit 4a210b0770
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/src/dom/impl/IdeaPluginConverter.java
+4 -3
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Condition;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.GlobalSearchScopesCore;
import com.intellij.psi.search.ProjectScope;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.xml.ConvertContext;
@@ -34,7 +35,6 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.devkit.DevKitBundle;
import org.jetbrains.idea.devkit.dom.IdeaPlugin;
import org.jetbrains.idea.devkit.dom.PluginModule;
import org.jetbrains.idea.devkit.util.PsiUtil;
import java.util.Collection;
import java.util.Collections;
@@ -108,8 +108,9 @@ public class IdeaPluginConverter extends ResolvingConverter<IdeaPlugin> {
public static Collection<IdeaPlugin> getAllPlugins(final Project project) {
if (DumbService.isDumb(project)) return Collections.emptyList();
GlobalSearchScope scope = PsiUtil.isIdeaProject(project) ?
GlobalSearchScopesCore.projectProductionScope(project) : GlobalSearchScope.allScope(project);
GlobalSearchScope scope = GlobalSearchScopesCore.projectProductionScope(project).
union(ProjectScope.getLibrariesScope(project));
List<DomFileElement<IdeaPlugin>> files = DomService.getInstance().getFileElements(IdeaPlugin.class, project, scope);
return ContainerUtil.map(files, new Function<DomFileElement<IdeaPlugin>, IdeaPlugin>() {
public IdeaPlugin fun(DomFileElement<IdeaPlugin> ideaPluginDomFileElement) {
plugins/devkit/testSources/codeInsight/PluginXmlFunctionalTest.groovy
+2 -2
View File
@@ -14,7 +14,6 @@
* limitations under the License.
*/
package org.jetbrains.idea.devkit.codeInsight
import com.intellij.codeInsight.TargetElementUtilBase
import com.intellij.codeInsight.completion.CompletionType
import com.intellij.codeInsight.documentation.DocumentationManager
@@ -38,7 +37,6 @@ import com.intellij.usageView.UsageViewNodeTextLocation
import com.intellij.usageView.UsageViewTypeLocation
import com.intellij.util.xml.DomTarget
import org.jetbrains.idea.devkit.inspections.*
/**
* @author peter
*/
@@ -150,6 +148,8 @@ public class PluginXmlFunctionalTest extends JavaCodeInsightFixtureTestCase {
myFixture.copyFileToProject(getTestName(false) + "_main.xml", "META-INF/plugin.xml");
myFixture.configureFromExistingVirtualFile(myFixture.copyFileToProject(getTestName(false) + "_dependent.xml", "META-INF/dep.xml"));
ApplicationManager.application.runWriteAction { PsiTestUtil.addSourceContentToRoots(myModule, myTempDirFixture.getFile("")) }
myFixture.checkHighlighting(false, false, false);
}