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

Use simple file URL as a key

Browse Source 
GitOrigin-RevId: 6c0272cd87a776cb55d2c79ab7537d072c4de2e9
This commit is contained in:
Rustam Vishnyakov
2020-05-09 05:25:10 +00:00
committed by intellij-monorepo-bot
parent 805fe7807b
commit 285eee7709
1 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/application/options/codeStyle/cache/CodeStyleCachingServiceImpl.java
Vendored
+11 -23
View File
@@ -5,7 +5,6 @@ import com.intellij.ide.plugins.DynamicPluginListener;
import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.UserDataHolder;
import com.intellij.openapi.util.UserDataHolderBase;
@@ -27,7 +26,6 @@ public class CodeStyleCachingServiceImpl implements CodeStyleCachingService, Dis
private final static Key<CodeStyleCachedValueProvider> PROVIDER_KEY = Key.create("code.style.cached.value.provider");
private final Map<String, FileData> myFileDataCache = new HashMap<>();
private final Project myProject;
private final Object CACHE_LOCK = new Object();
@@ -35,8 +33,7 @@ public class CodeStyleCachingServiceImpl implements CodeStyleCachingService, Dis
MAX_CACHE_SIZE,
Comparator.comparingLong(fileData -> fileData.lastRefTimeStamp));
public CodeStyleCachingServiceImpl(Project project) {
myProject = project;
public CodeStyleCachingServiceImpl() {
ApplicationManager.getApplication().getMessageBus().connect(this).
subscribe(DynamicPluginListener.TOPIC, new DynamicPluginListener() {
@Override
@@ -62,16 +59,13 @@ public class CodeStyleCachingServiceImpl implements CodeStyleCachingService, Dis
synchronized (CACHE_LOCK) {
VirtualFile virtualFile = file.getVirtualFile();
if (virtualFile != null) {
String filePath = getFilePath(virtualFile);
if (filePath != null) {
FileData fileData = getOrCreateFileData(filePath);
CodeStyleCachedValueProvider provider = fileData.getUserData(PROVIDER_KEY);
if (provider == null || provider.isExpired()) {
provider = new CodeStyleCachedValueProvider(file);
fileData.putUserData(PROVIDER_KEY, provider);
}
return provider;
FileData fileData = getOrCreateFileData(getFileKey(virtualFile));
CodeStyleCachedValueProvider provider = fileData.getUserData(PROVIDER_KEY);
if (provider == null || provider.isExpired()) {
provider = new CodeStyleCachedValueProvider(file);
fileData.putUserData(PROVIDER_KEY, provider);
}
return provider;
}
return null;
}
@@ -96,8 +90,7 @@ public class CodeStyleCachingServiceImpl implements CodeStyleCachingService, Dis
@Override
@Nullable
public UserDataHolder getDataHolder(@NotNull VirtualFile virtualFile) {
String filePath = getFilePath(virtualFile);
return filePath != null ? getOrCreateFileData(filePath) : null;
return getOrCreateFileData(getFileKey(virtualFile));
}
@NotNull
@@ -119,14 +112,9 @@ public class CodeStyleCachingServiceImpl implements CodeStyleCachingService, Dis
return newData;
}
@Nullable
private String getFilePath(VirtualFile file) {
if (!file.isInLocalFileSystem()) {
return myProject.getBasePath() +
"/" + file.getNameWithoutExtension() +
"." + file.getFileType().getDefaultExtension();
}
return file.getCanonicalPath();
@NotNull
private static String getFileKey(VirtualFile file) {
return file.getUrl();
}
@Override