move PsiCachedValue and friends to core-impl; register it in CoreEnvironment

diff --git a/platform/core-impl/src/com/intellij/core/CoreEnvironment.java b/platform/core-impl/src/com/intellij/core/CoreEnvironment.java
index ad74656bc4581f14ea3f15c9fbde8b8efaa73ed9..9e378fb472bc99d3a5ce7c960a58918f33798db1 100644 (file)
--- a/platform/core-impl/src/com/intellij/core/CoreEnvironment.java
+++ b/platform/core-impl/src/com/intellij/core/CoreEnvironment.java
@@ -34,6 +34,7 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Getter;
 import com.intellij.psi.PsiFileFactory;
 import com.intellij.psi.PsiManager;
+import com.intellij.psi.impl.PsiCachedValuesFactory;
 import com.intellij.psi.impl.PsiFileFactoryImpl;
 import com.intellij.psi.impl.PsiManagerImpl;
 import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
@@ -85,7 +86,7 @@ public class CoreEnvironment {
     registerComponentInstance(projectContainer, PsiManager.class, psiManager);
 
     myProject.registerService(PsiFileFactory.class, new PsiFileFactoryImpl(psiManager));
-    myProject.registerService(CachedValuesManager.class, new CachedValuesManagerImpl(myProject, null));
+    myProject.registerService(CachedValuesManager.class, new CachedValuesManagerImpl(myProject, new PsiCachedValuesFactory(psiManager)));
   }
 
   public Project getProject() {

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/PsiCachedValue.java b/platform/core-impl/src/com/intellij/psi/impl/PsiCachedValue.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/impl/PsiCachedValue.java
rename to platform/core-impl/src/com/intellij/psi/impl/PsiCachedValue.java

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/PsiCachedValueImpl.java b/platform/core-impl/src/com/intellij/psi/impl/PsiCachedValueImpl.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/impl/PsiCachedValueImpl.java
rename to platform/core-impl/src/com/intellij/psi/impl/PsiCachedValueImpl.java

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/PsiCachedValuesFactory.java b/platform/core-impl/src/com/intellij/psi/impl/PsiCachedValuesFactory.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/impl/PsiCachedValuesFactory.java
rename to platform/core-impl/src/com/intellij/psi/impl/PsiCachedValuesFactory.java

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/PsiParameterizedCachedValue.java b/platform/core-impl/src/com/intellij/psi/impl/PsiParameterizedCachedValue.java
similarity index 100%
rename from platform/lang-impl/src/com/intellij/psi/impl/PsiParameterizedCachedValue.java
rename to platform/core-impl/src/com/intellij/psi/impl/PsiParameterizedCachedValue.java

diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index c1e39d7b453708beb74d1b5a9ed715e5350eb285..a77bbeeb54bfd7c3c01406d0c62b7558f442e991 100644 (file)
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -196,7 +196,7 @@
   <projectService serviceInterface="com.intellij.psi.impl.include.FileIncludeManager"
                   serviceImplementation="com.intellij.psi.impl.include.FileIncludeManagerImpl"/>
   <projectService serviceInterface="com.intellij.util.CachedValuesFactory"
-                  serviceImplementation="com.intellij.psi.impl.PsiCachedValuesFactory"/> 
+                  serviceImplementation="com.intellij.psi.impl.PsiCachedValuesFactory"/>
 
 
   <projectService serviceInterface="com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable"