From 7d2f1c386a6b5a04ff9b1181eb49b7aeef4d0975 Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Thu, 1 Mar 2018 16:28:30 +0300
Subject: [PATCH] IDEA-186983, EA-102443 - NPE at saving folding settings

---
 .../editor/CodeFoldingConfigurable.java       | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
index 7f54217e25c0..c2d7298d9cad 100644
--- a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
@@ -1,18 +1,4 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 
 package com.intellij.application.options.editor;
 
@@ -82,7 +68,10 @@ public class CodeFoldingConfigurable extends CompositeConfigurable<CodeFoldingOp
     EditorOptionsPanel.reinitAllEditors();
     for (Editor editor : EditorFactory.getInstance().getAllEditors()) {
       Project project = editor.getProject();
-      if (project != null) CodeFoldingManager.getInstance(project).scheduleAsyncFoldingUpdate(editor);
+      if (project != null) {
+        CodeFoldingManager codeFoldingManager = CodeFoldingManager.getInstance(project);
+        if (codeFoldingManager != null) codeFoldingManager.scheduleAsyncFoldingUpdate(editor); // can be null for default project
+      }
     }
   }