From b7c4461434a450fbc8e6c9d229b5e19c48ddffc3 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Mon, 1 Sep 2014 11:49:53 +0200
Subject: [PATCH] CLion: CPP-66 Automatically generate run configurations for
 targets * API extended without breaking it

---
 .../configurations/RunConfigurationsSettings.java    |  3 +--
 .../com/intellij/execution/impl/RunConfigurable.java | 12 +++---------
 .../src/META-INF/LangExtensionPoints.xml             |  3 ++-
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationsSettings.java b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationsSettings.java
index 259fd4e7484c..732976cf73a7 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationsSettings.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationsSettings.java
@@ -17,12 +17,11 @@ package com.intellij.execution.configurations;
 
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.options.UnnamedConfigurable;
-import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
 public interface RunConfigurationsSettings {
   ExtensionPointName<RunConfigurationsSettings> EXTENSION_POINT = ExtensionPointName.create("com.intellij.runConfigurationsSettings");
 
   @NotNull
-  UnnamedConfigurable createConfigurable(@NotNull Project project);
+  UnnamedConfigurable createConfigurable();
 }
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
index 95d4db09c297..1a006c294275 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
@@ -588,15 +588,9 @@ class RunConfigurable extends BaseConfigurable {
 
   @Override
   public JComponent createComponent() {
-    for (RunConfigurationsSettings each : Extensions.getExtensions(RunConfigurationsSettings.EXTENSION_POINT)) {
-      try {
-        UnnamedConfigurable configurable = each.createConfigurable(myProject);
-        myAdditionalSettings.add(Pair.create(configurable, configurable.createComponent()));
-      }
-      catch (NoSuchMethodError e) {
-        // in case someone has already implemented old RunConfigurationsSettings.createConfigurable()
-        LOG.error(e);
-      }
+    for (RunConfigurationsSettings each : Extensions.getExtensions(RunConfigurationsSettings.EXTENSION_POINT, myProject)) {
+      UnnamedConfigurable configurable = each.createConfigurable();
+      myAdditionalSettings.add(Pair.create(configurable, configurable.createComponent()));
     }
 
     myWholePanel = new JPanel(new BorderLayout());
diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
index dcdc0e2d983c..2e2e0c80bb17 100644
--- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
@@ -385,7 +385,8 @@
                     interface="com.intellij.execution.configurations.ConfigurationType"/>
 
     <extensionPoint name="runConfigurationsSettings"
-                    interface="com.intellij.execution.configurations.RunConfigurationsSettings"/>
+                    interface="com.intellij.execution.configurations.RunConfigurationsSettings"
+                    area="IDEA_PROJECT"/>
 
     <extensionPoint name="programRunner"
                     interface="com.intellij.execution.runners.ProgramRunner"/>