From 5e27e4c377577bfa4535abd74fb9bcc5ad1696b2 Mon Sep 17 00:00:00 2001
From: William Riley <william.riley@renesas.com>
Date: Fri, 9 Feb 2018 13:23:33 +0000
Subject: [PATCH] Bug 530941 - Ignore editor file unless editor is active

Change-Id: Ie755f80cc01f55c0d4b9b704ff40008b8bb841af
Signed-off-by: William Riley <william.riley@renesas.com>
---
 .../plugin.xml                                | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 39299a9a312..e9df66e8a4f 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -103,14 +103,23 @@
                   <test property="org.eclipse.cdt.ui.checkPreference"
                         value="org.eclipse.core.resources/description.autobuilding=false"/>
                   <or>
-                     <reference
-                           definitionId="org.eclipse.cdt.managedbuilder.ui.isBuildableFileOpenInEditor"/>
                      <with variable="selection">
                         <iterate ifEmpty="false">
                            <reference
                                  definitionId="org.eclipse.cdt.managedbuilder.ui.isBuildableFile"/>
                         </iterate>
                      </with>
+                     <and>
+                        <reference
+                              definitionId="org.eclipse.cdt.managedbuilder.ui.isBuildableFileOpenInEditor">
+                        </reference>
+                        <with
+                              variable="activePart">
+                           <instanceof
+                                 value="org.eclipse.ui.IEditorPart">
+                           </instanceof>
+                        </with>
+                     </and>
                   </or>
                </and>
             </visibleWhen>
@@ -124,14 +133,23 @@
                   <test property="org.eclipse.cdt.ui.checkPreference"
                         value="org.eclipse.core.resources/description.autobuilding=false"/>
                   <or>
-                     <reference
-                           definitionId="org.eclipse.cdt.managedbuilder.ui.isBuildableFileOpenInEditor"/>
                      <with variable="selection">
                         <iterate ifEmpty="false">
                            <reference
                                  definitionId="org.eclipse.cdt.managedbuilder.ui.isBuildableFile"/>
                         </iterate>
                      </with>
+                     <and>
+                        <reference
+                              definitionId="org.eclipse.cdt.managedbuilder.ui.isBuildableFileOpenInEditor">
+                        </reference>
+                        <with
+                              variable="activePart">
+                           <instanceof
+                                 value="org.eclipse.ui.IEditorPart">
+                           </instanceof>
+                        </with>
+                     </and>
                   </or>
                </and>
             </visibleWhen>