From 8cdaaee00d8b7a8ca82b397d615afb1a1ed1bb64 Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 25 Jul 2012 12:10:51 +0200 Subject: [PATCH] move PsiShortNamesCache to java-indexing --- .../intellij/psi/search/PsiShortNamesCache.java | 0 .../psi/impl/CompositeShortNamesCache.java | 0 .../intellij/psi/impl/PsiShortNamesCacheImpl.java | 6 +++--- .../impl/java/stubs/index/JavaFieldNameIndex.java | 0 .../impl/java/stubs/index/JavaMethodNameIndex.java | 0 .../java/stubs/index/JavaShortClassNameIndex.java | 0 .../intellij/core/CoreApplicationEnvironment.java | 1 + .../com/intellij/core/CoreProjectEnvironment.java | 14 ++++++++++++++ .../src/com/intellij/psi/search/FilenameIndex.java | 0 .../util/indexing/ScalarIndexExtension.java | 0 .../uiDesigner/GuiDesignerConfigurable.java | 1 - 11 files changed, 18 insertions(+), 4 deletions(-) rename java/{openapi => java-indexing-api}/src/com/intellij/psi/search/PsiShortNamesCache.java (100%) rename java/{java-impl => java-indexing-impl}/src/com/intellij/psi/impl/CompositeShortNamesCache.java (100%) rename java/{java-impl => java-indexing-impl}/src/com/intellij/psi/impl/PsiShortNamesCacheImpl.java (97%) rename java/{java-impl => java-indexing-impl}/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java (100%) rename java/{java-impl => java-indexing-impl}/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java (100%) rename java/{java-impl => java-indexing-impl}/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java (100%) rename platform/{lang-impl => indexing-impl}/src/com/intellij/psi/search/FilenameIndex.java (100%) rename platform/{lang-impl => indexing-impl}/src/com/intellij/util/indexing/ScalarIndexExtension.java (100%) diff --git a/java/openapi/src/com/intellij/psi/search/PsiShortNamesCache.java b/java/java-indexing-api/src/com/intellij/psi/search/PsiShortNamesCache.java similarity index 100% rename from java/openapi/src/com/intellij/psi/search/PsiShortNamesCache.java rename to java/java-indexing-api/src/com/intellij/psi/search/PsiShortNamesCache.java diff --git a/java/java-impl/src/com/intellij/psi/impl/CompositeShortNamesCache.java b/java/java-indexing-impl/src/com/intellij/psi/impl/CompositeShortNamesCache.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/CompositeShortNamesCache.java rename to java/java-indexing-impl/src/com/intellij/psi/impl/CompositeShortNamesCache.java diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiShortNamesCacheImpl.java b/java/java-indexing-impl/src/com/intellij/psi/impl/PsiShortNamesCacheImpl.java similarity index 97% rename from java/java-impl/src/com/intellij/psi/impl/PsiShortNamesCacheImpl.java rename to java/java-indexing-impl/src/com/intellij/psi/impl/PsiShortNamesCacheImpl.java index c6989f730f34..215c9eb22fb5 100644 --- a/java/java-impl/src/com/intellij/psi/impl/PsiShortNamesCacheImpl.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/PsiShortNamesCacheImpl.java @@ -15,7 +15,7 @@ */ package com.intellij.psi.impl; -import com.intellij.openapi.progress.ProgressManager; +import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.impl.java.stubs.index.JavaFieldNameIndex; @@ -42,7 +42,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; -class PsiShortNamesCacheImpl extends PsiShortNamesCache { +public class PsiShortNamesCacheImpl extends PsiShortNamesCache { private final PsiManagerEx myManager; public PsiShortNamesCacheImpl(PsiManagerEx manager) { @@ -225,7 +225,7 @@ class PsiShortNamesCacheImpl extends PsiShortNamesCache { }); for (T member : members) { - ProgressManager.checkCanceled(); + ProgressIndicatorProvider.checkCanceled(); if (!scope.contains(member.getContainingFile().getVirtualFile())) continue; if (!set.add(member)) continue; diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java b/java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java rename to java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java b/java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java rename to java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java b/java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java similarity index 100% rename from java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java rename to java/java-indexing-impl/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java diff --git a/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java b/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java index b1d7f8dda27c..9602e9463bc2 100644 --- a/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java +++ b/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java @@ -258,6 +258,7 @@ public class CoreApplicationEnvironment { }); } + public static void registerExtensionPoint(final ExtensionsArea area, final ExtensionPointName extensionPointName, final Class aClass) { final String name = extensionPointName.getName(); diff --git a/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java b/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java index 9c285ef6a2a3..2f1570b4c56b 100644 --- a/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java +++ b/platform/core-impl/src/com/intellij/core/CoreProjectEnvironment.java @@ -20,10 +20,12 @@ import com.intellij.mock.MockFileIndexFacade; import com.intellij.mock.MockProject; import com.intellij.mock.MockResolveScopeManager; import com.intellij.openapi.Disposable; +import com.intellij.openapi.extensions.ExtensionPoint; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.roots.FileIndexFacade; +import com.intellij.openapi.util.Disposer; import com.intellij.psi.PsiFileFactory; import com.intellij.psi.PsiManager; import com.intellij.psi.impl.*; @@ -96,6 +98,18 @@ public class CoreProjectEnvironment { CoreApplicationEnvironment.registerExtensionPoint(Extensions.getArea(myProject), extensionPointName, aClass); } + protected void addProjectExtension(final ExtensionPointName name, final T extension) { + final ExtensionPoint extensionPoint = Extensions.getArea(myProject).getExtensionPoint(name); + extensionPoint.registerExtension(extension); + Disposer.register(myParentDisposable, new Disposable() { + @Override + public void dispose() { + extensionPoint.unregisterExtension(extension); + } + }); + } + + public void registerProjectComponent(final Class interfaceClass, final T implementation) { CoreApplicationEnvironment.registerComponentInstance(myProject.getPicoContainer(), interfaceClass, implementation); } diff --git a/platform/lang-impl/src/com/intellij/psi/search/FilenameIndex.java b/platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java similarity index 100% rename from platform/lang-impl/src/com/intellij/psi/search/FilenameIndex.java rename to platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java diff --git a/platform/lang-impl/src/com/intellij/util/indexing/ScalarIndexExtension.java b/platform/indexing-impl/src/com/intellij/util/indexing/ScalarIndexExtension.java similarity index 100% rename from platform/lang-impl/src/com/intellij/util/indexing/ScalarIndexExtension.java rename to platform/indexing-impl/src/com/intellij/util/indexing/ScalarIndexExtension.java diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java index fa013d413f70..2611a38414b4 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java @@ -16,7 +16,6 @@ package com.intellij.uiDesigner; import com.intellij.codeInsight.CodeInsightUtil; -import com.intellij.icons.AllIcons; import com.intellij.ui.ListCellRendererWrapper; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.CommandProcessor;