From fd1ac2cf75f1e8ec9fa28fc4e1f8013df9f2c49d Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 25 Jul 2019 12:14:51 +0200
Subject: [PATCH] use cancelled promise instead of rejected

GitOrigin-RevId: 569b4f5c58d0dcaaa820646eda76c843275cc5b2
---
 .../intellij/openapi/options/newEditor/SettingsEditor.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java
index 3888f9f27c32..af39d196db00 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsEditor.java
@@ -148,13 +148,14 @@ final class SettingsEditor extends AbstractEditor implements DataProvider {
         return updateIfCurrent(myFilter.myContext.getCurrentConfigurable());
       }
 
-      private Promise<? super Object> updateIfCurrent(Configurable configurable) {
+      @NotNull
+      private Promise<? super Object> updateIfCurrent(@Nullable Configurable configurable) {
         if (configurable != null && configurable == myFilter.myContext.getCurrentConfigurable()) {
           updateStatus(configurable);
           return Promises.resolvedPromise();
         }
         else {
-          return Promises.rejectedPromise("rejected");
+          return Promises.cancelledPromise();
         }
       }
     });