From a048035d971c9807748b0df370c063275acea552 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 7 Dec 2016 18:02:22 +0100
Subject: [PATCH] =?UTF-8?q?nodejs=20rc=20producer=20using=20yml=20config?=
 =?UTF-8?q?=20file=20=E2=80=94=20fix=20isConfigurationFromContext=20(stand?=
 =?UTF-8?q?ard=20nodejs=20rc=20should=20be=20not=20used=20if=20configured?=
 =?UTF-8?q?=20detected)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actions/RunConfigurationProducer.java     | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java b/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java
index b9a44ffa7bc8..fa39564c294f 100644
--- a/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java
+++ b/platform/lang-api/src/com/intellij/execution/actions/RunConfigurationProducer.java
@@ -176,19 +176,20 @@ public abstract class RunConfigurationProducer<T extends RunConfiguration> {
     }
 
     ConfigurationFromContext fromContext = createConfigurationFromContext(context);
-    if (fromContext != null) {
-      final PsiElement psiElement = fromContext.getSourceElement();
-      final Location<PsiElement> _location = PsiLocation.fromPsiElement(psiElement, location.getModule());
-      if (_location != null) {
-        // replace with existing configuration if any
-        final RunManager runManager = RunManager.getInstance(context.getProject());
-        final ConfigurationType type = fromContext.getConfigurationType();
-        final RunnerAndConfigurationSettings settings = findExistingConfiguration(context);
-        if (settings != null) {
-          fromContext.setConfigurationSettings(settings);
-        } else {
-          runManager.setUniqueNameIfNeed(fromContext.getConfiguration());
-        }
+    if (fromContext == null) {
+      return null;
+    }
+
+    final PsiElement psiElement = fromContext.getSourceElement();
+    final Location<PsiElement> _location = PsiLocation.fromPsiElement(psiElement, location.getModule());
+    if (_location != null) {
+      // replace with existing configuration if any
+      RunnerAndConfigurationSettings settings = findExistingConfiguration(context);
+      if (settings == null) {
+        RunManager.getInstance(context.getProject()).setUniqueNameIfNeed(fromContext.getConfiguration());
+      }
+      else {
+        fromContext.setConfigurationSettings(settings);
       }
     }