MPS-23999 Text files are not opening in editor

use CorePsiDocumentManager instead of NullPsiDocumentManager to avoid 'copy paste' code in method commitAndRunReadAction() due to TextEditorImpl now uses AsyncEditorLoader for heavy back ground tasks
JetBrains · Jun 26, 2016 · 10d2835 · 10d2835
1 parent bd4461c
commit 10d2835
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 13 deletions.
diff --git a/workbench/mps-workbench/source/META-INF/IdeaPlugin.xml b/workbench/mps-workbench/source/META-INF/IdeaPlugin.xml
@@ -35,6 +35,8 @@
     <directoryIndexExcludePolicy implementation="jetbrains.mps.ide.vfs.ClassesGenPolicy"/>
 
     <!--<bundledColorScheme path="/colorSchemes/Darcula"/>-->
+    <projectService serviceInterface="com.intellij.psi.impl.file.PsiDirectoryFactory"
+                    serviceImplementation="com.intellij.psi.impl.file.PsiDirectoryFactoryImpl"/>
 
     <projectService serviceInterface="com.intellij.ide.projectView.impl.nodes.ProjectViewDirectoryHelper"
                     serviceImplementation="com.intellij.ide.projectView.impl.nodes.ProjectViewDirectoryHelper"/>

diff --git a/workbench/mps-workbench/source/META-INF/MPSLangExtensions.xml b/workbench/mps-workbench/source/META-INF/MPSLangExtensions.xml
@@ -47,10 +47,12 @@
                         serviceImplementation="com.intellij.execution.filters.TextConsoleBuilderFactoryImpl"/>
     <applicationService serviceInterface="com.intellij.execution.filters.HyperlinkInfoFactory"
                         serviceImplementation="com.intellij.execution.filters.impl.HyperlinkInfoFactoryImpl"/>
+    -->
 
     <applicationService serviceInterface="com.intellij.lang.PsiBuilderFactory"
-                        serviceImplementation="com.intellij.lang.impl.PsiBuilderFactoryImpl"/>
+    serviceImplementation="com.intellij.lang.impl.PsiBuilderFactoryImpl"/>
 
+    <!--
     <applicationService serviceImplementation="com.intellij.codeInsight.documentation.DocumentationManagerUtil"/>
 
     <applicationService serviceImplementation="com.intellij.navigation.ChooseByNameRegistry"/>
@@ -78,10 +80,12 @@
 
     <applicationService serviceInterface="com.intellij.facet.FacetTypeRegistry"
                         serviceImplementation="com.intellij.facet.impl.FacetTypeRegistryImpl"/>
+    -->
 
     <projectService serviceInterface="com.intellij.openapi.roots.impl.DirectoryIndex"
                     serviceImplementation="com.intellij.openapi.roots.impl.DirectoryIndexImpl"/>
 
+    <!--
     <projectService serviceInterface="com.intellij.pom.references.PomService"
                     serviceImplementation="com.intellij.pom.references.PomServiceImpl"/>
     -->
@@ -171,7 +175,10 @@
     <applicationService serviceInterface="com.intellij.util.download.DownloadableFileService"
                         serviceImplementation="com.intellij.util.download.impl.DownloadableFileServiceImpl"/>
 
-    <applicationService serviceImplementation="com.intellij.psi.impl.DocumentCommitThread"/>
+    -->
+    <applicationService serviceInterface="com.intellij.psi.impl.DocumentCommitProcessor"
+    serviceImplementation="com.intellij.core.MockDocumentCommitProcessor"/>
+    <!--
 
     <applicationService serviceInterface="com.intellij.psi.stubs.StubTreeLoader"
                         serviceImplementation="com.intellij.psi.stubs.StubTreeLoaderImpl"/>
@@ -957,10 +964,12 @@
     <editorNotificationProvider implementation="com.intellij.ide.GeneratedFileEditingNotificationProvider"/>
 
     <editorTabTitleProvider implementation="com.intellij.openapi.fileEditor.impl.UniqueNameEditorTabTitleProvider" order="last"/>
+    -->
 
     <projectService serviceInterface="com.intellij.psi.util.PsiModificationTracker"
-                    serviceImplementation="com.intellij.psi.impl.PsiModificationTrackerImpl"/>
+    serviceImplementation="com.intellij.psi.impl.PsiModificationTrackerImpl"/>
 
+    <!--
     <itemPresentationProvider forClass="com.intellij.psi.PsiDirectory"
                               implementationClass="com.intellij.navigation.DirectoryPresentationProvider"/>
 

diff --git a/workbench/mps-workbench/source/componentSets/MPSLang.xml b/workbench/mps-workbench/source/componentSets/MPSLang.xml
@@ -23,7 +23,6 @@
     </component>
 
     <component>
-      <interface-class>com.intellij.tools.ToolManager</interface-class>
       <implementation-class>com.intellij.tools.ToolManager</implementation-class>
     </component>
 
@@ -40,6 +39,12 @@
       <implementation-class>com.intellij.codeInsight.preview.ImageOrColorPreviewManager</implementation-class>
     </component>
 
+    <!--
+    <component>
+      <implementation-class>com.intellij.ide.script.IdeStartupScripts</implementation-class>
+    </component>
+    -->
+
   </application-components>
 
   <project-components>
@@ -53,26 +58,19 @@
       <implementation-class>com.intellij.openapi.roots.impl.ProjectRootManagerComponent</implementation-class>
       <loadForDefaultProject/>
     </component>
-    <component>
-      <interface-class>com.intellij.openapi.roots.impl.DirectoryIndex</interface-class>
-      <implementation-class>com.intellij.openapi.roots.impl.DirectoryIndexImpl</implementation-class>
-      <loadForDefaultProject/>
-    </component>
 
     <component>
       <interface-class>com.intellij.psi.PsiManager</interface-class>
-      <implementation-class>jetbrains.mps.workbench.psi.NullPsiManager</implementation-class>
+      <implementation-class>com.intellij.psi.impl.PsiManagerImpl</implementation-class>
       <loadForDefaultProject/>
     </component>
-    <!--
     <component>
       <interface-class>com.intellij.psi.impl.file.impl.PsiVFSListener</interface-class>
       <implementation-class>com.intellij.psi.impl.file.impl.PsiVFSListener</implementation-class>
     </component>
-    -->
     <component>
       <interface-class>com.intellij.psi.PsiDocumentManager</interface-class>
-      <implementation-class>jetbrains.mps.workbench.psi.NullPsiDocumentManager</implementation-class>
+      <implementation-class>com.intellij.core.CorePsiDocumentManager</implementation-class>
       <loadForDefaultProject/>
     </component>
 

diff --git a/workbench/mps-workbench/source/jetbrains/mps/workbench/psi/NullFileManager.java b/workbench/mps-workbench/source/jetbrains/mps/workbench/psi/NullFileManager.java
@@ -28,7 +28,9 @@
 /**
  * User: shatalin
  * Date: 11/20/12
+ * @deprecated since MPS 3.4, use {@link com.intellij.psi.impl.file.impl.FileManagerImpl}
  */
+@Deprecated
 public class NullFileManager implements FileManager {
   @Nullable
   @Override

diff --git a/workbench/mps-workbench/source/jetbrains/mps/workbench/psi/NullPsiDocumentManager.java b/workbench/mps-workbench/source/jetbrains/mps/workbench/psi/NullPsiDocumentManager.java
@@ -26,6 +26,10 @@
 
 import java.util.Collection;
 
+/**
+ * @deprecated since MPS 3.4, use {@link com.intellij.core.CorePsiDocumentManager}
+ */
+@Deprecated
 public class NullPsiDocumentManager extends PsiDocumentManager {
   @Override
   public boolean isCommitted(@NotNull Document document) {

diff --git a/workbench/mps-workbench/source/jetbrains/mps/workbench/psi/NullPsiManager.java b/workbench/mps-workbench/source/jetbrains/mps/workbench/psi/NullPsiManager.java
@@ -32,6 +32,10 @@
 import org.jetbrains.annotations.Nullable;
 
 
+/**
+ * @deprecated since MPS 3.4, use {@link com.intellij.psi.impl.PsiManagerImpl}
+ */
+@Deprecated
 class NullPsiManager extends PsiManagerImpl {
   private Project myProject;
   private FileManager myFileManager;