From fbb42192462ccf603899baa640df709c6d9db227 Mon Sep 17 00:00:00 2001
From: Rustam Vishnyakov <rustam.vishnyakov@jetbrains.com>
Date: Mon, 23 Dec 2019 14:22:51 +0300
Subject: [PATCH] Check for AppCodeStyleSettingsManager nullability instead not
 to break other tests

GitOrigin-RevId: 622ca18952ea9c9e7658e569d3f2de466afcd9c4
---
 .../psi/impl/source/codeStyle/CodeStyleSchemesImpl.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java
index 5f2f26c0264b..8283f9a3e1f1 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java
@@ -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()
     );