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

Fix code style caching exception: Non-idempotent computation: it returns different results when invoked multiple times

Browse Source 
Return only fully computed code style holder. Another thread will wait till the computation is over.
This commit is contained in:
Rustam Vishnyakov
2019-03-20 14:42:32 +03:00
parent ab2449ca99
commit ff92b72bb0
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/application/options/CodeStyleCachingUtil.java
+20 -16
View File
@@ -14,34 +14,34 @@ import org.jetbrains.annotations.NotNull;
class CodeStyleCachingUtil {
private final static Logger LOG = Logger.getInstance(CodeStyleCachingUtil.class);
private final static Object COMPUTATION_LOCK = new Object();
private final static ExtensionPointName<CodeStyleSettingsModifier> CODE_STYLE_SETTINGS_MODIFIER_EP_NAME =
ExtensionPointName.create("com.intellij.codeStyleSettingsModifier");
@NotNull
static CodeStyleSettings getCachedCodeStyle(@NotNull PsiFile file) {
CachedCodeStyleHolder cachedCodeStyleHolder = CachedValuesManager.getCachedValue(
file,
() -> {
CachedCodeStyleHolder holder = new CachedCodeStyleHolder(file);
if (LOG.isDebugEnabled()) {
logCached(file, holder);
}
return new CachedValueProvider.Result<>(holder, holder.getDependencies());
});
CachedCodeStyleHolder cachedCodeStyleHolder = CachedValuesManager.getCachedValue(file, () -> createHolder(file).getCachedResult());
return cachedCodeStyleHolder.getCachedSettings();
}
static class CachedCodeStyleHolder {
private @NotNull CodeStyleSettings myCachedSettings;
private static CachedCodeStyleHolder createHolder(@NotNull PsiFile file) {
CachedCodeStyleHolder holder = new CachedCodeStyleHolder();
synchronized (COMPUTATION_LOCK) {
holder.compute(file);
}
if (LOG.isDebugEnabled()) {
logCached(file, holder);
}
return holder;
}
CachedCodeStyleHolder(@NotNull PsiFile file) {
static class CachedCodeStyleHolder {
private @NotNull CodeStyleSettings myCachedSettings = CodeStyle.getDefaultSettings();
private void compute(@NotNull PsiFile file) {
//noinspection deprecation
myCachedSettings = CodeStyleSettingsManager.getInstance(file.getProject()).getCurrentSettings();
updateFor(file);
}
private void updateFor(@NotNull PsiFile file) {
TransientCodeStyleSettings modifiableSettings = new TransientCodeStyleSettings(file, myCachedSettings);
for (CodeStyleSettingsModifier modifier : CODE_STYLE_SETTINGS_MODIFIER_EP_NAME.getExtensionList()) {
if (modifier.modifySettings(modifiableSettings, file)) {
@@ -64,6 +64,10 @@ class CodeStyleCachingUtil {
CodeStyleSettings getCachedSettings() {
return myCachedSettings;
}
CachedValueProvider.Result<CachedCodeStyleHolder> getCachedResult() {
return new CachedValueProvider.Result<>(this, this.getDependencies());
}
}
private static void logCached(@NotNull PsiFile file, @NotNull CachedCodeStyleHolder holder) {