more correct fix of IDEA-368941 AlreadyDisposedException from FileTypeRegistry: create Application before FileTypeRegistry, since the latter requires the former

(cherry picked from commit a1c7e19690575d0c9e4c8d5f142bb5d121286afa)

IJ-CR-158988

GitOrigin-RevId: 9b65fca4146f73153d57c0798e928758dc5e2200
This commit is contained in:
Alexey Kudravtsev
2025-03-14 14:45:51 +01:00
committed by intellij-monorepo-bot
parent 200bd755d3
commit 127f364c0b

View File

@@ -29,6 +29,7 @@ import com.intellij.openapi.extensions.impl.ExtensionsAreaImpl;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeExtension;
import com.intellij.openapi.fileTypes.FileTypeRegistry;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.impl.CoreProgressManager;
import com.intellij.openapi.util.ClassExtension;
@@ -82,12 +83,10 @@ public class CoreApplicationEnvironment {
PluginEnabler.HEADLESS.setIgnoredDisabledPlugins(true);
application = createApplication(parentDisposable);
ApplicationManager.setApplication(application, parentDisposable);
myFileTypeRegistry = new CoreFileTypeRegistry();
application = createApplication(myParentDisposable);
ApplicationManager.setApplication(application,
() -> myFileTypeRegistry,
myParentDisposable);
FileTypeRegistry.setInstanceSupplier(() -> myFileTypeRegistry, parentDisposable);
myLocalFileSystem = createLocalFileSystem();
myJarFileSystem = createJarFileSystem();
myJrtFileSystem = createJrtFileSystem();