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

Cache VirtualFileManager instance in a way that is compatible with Kotlin tests (which recreate Application several times during execution)

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-03-20 13:36:00 +01:00
parent 09d6f71387
commit 4475bb2482
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/openapi/vfs/VirtualFileManager.java
+8 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package com.intellij.openapi.vfs;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.CachedSingletonsRegistry;
import com.intellij.openapi.util.ModificationTracker;
import com.intellij.openapi.vfs.newvfs.BulkFileListener;
import com.intellij.util.io.URLUtil;
@@ -41,9 +42,7 @@ public abstract class VirtualFileManager implements ModificationTracker {
}
};
private static class InstanceHolder {
static final VirtualFileManager ourInstance = ApplicationManager.getApplication().getComponent(VirtualFileManager.class);
}
private static VirtualFileManager ourInstance = CachedSingletonsRegistry.markCachedField(VirtualFileManager.class);
/**
* Gets the instance of {@code VirtualFileManager}.
@@ -52,7 +51,11 @@ public abstract class VirtualFileManager implements ModificationTracker {
*/
@NotNull
public static VirtualFileManager getInstance() {
return InstanceHolder.ourInstance;
VirtualFileManager result = ourInstance;
if (result == null) {
ourInstance = result = ApplicationManager.getApplication().getComponent(VirtualFileManager.class);
}
return result;
}
/**