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

Check for AppCodeStyleSettingsManager nullability instead not to break other tests

Browse Source 
GitOrigin-RevId: 622ca18952ea9c9e7658e569d3f2de466afcd9c4
This commit is contained in:
Rustam Vishnyakov
2019-12-23 13:08:30 +00:00
committed by intellij-monorepo-bot
parent 75375afd66
commit fbb4219246
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java
+5 -2
View File
@@ -10,6 +10,7 @@ import com.intellij.openapi.extensions.PluginDescriptor;
import com.intellij.openapi.options.SchemeManager;
import com.intellij.openapi.options.SchemeManagerFactory;
import com.intellij.psi.codeStyle.*;
import com.intellij.util.ObjectUtils;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.xmlb.annotations.Transient;
import org.jetbrains.annotations.NonNls;
@@ -64,13 +65,15 @@ public abstract class CodeStyleSchemesImpl extends CodeStyleSchemes {
@Override
public void extensionAdded(@NotNull LanguageCodeStyleSettingsProvider extension, @NotNull PluginDescriptor pluginDescriptor) {
//noinspection deprecation
CodeStyleSettingsManager.getInstance().registerLanguageSettings(getAllSettings(), extension);
ObjectUtils.consumeIfNotNull(CodeStyleSettingsManager.getInstance(),
instance -> instance.registerLanguageSettings(getAllSettings(), extension));
}
@Override
public void extensionRemoved(@NotNull LanguageCodeStyleSettingsProvider extension, @NotNull PluginDescriptor pluginDescriptor) {
//noinspection deprecation
CodeStyleSettingsManager.getInstance().unregisterLanguageSettings(getAllSettings(), extension);
ObjectUtils.consumeIfNotNull(CodeStyleSettingsManager.getInstance(),
instance -> instance.unregisterLanguageSettings(getAllSettings(), extension));
}
}, ApplicationManager.getApplication()
);