From 481f08beb43d41de50f3465004b29c0c2fd9ace5 Mon Sep 17 00:00:00 2001 From: Abdullah Khalid Date: Wed, 16 Jun 2021 23:08:04 +0400 Subject: [PATCH] Bug 574239 - Adding path mapping through CSourceNotFoundEditor makes launch configuration's Source tab dirty Change-Id: I32396e274e4e803344d5e4a56324fb84ca40fd93 --- dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF | 2 +- .../launching/CoreBuildLocalDebugLaunchDelegate.java | 6 +++++- .../eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF index 4b353fc32b7..d4489d1517f 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.cdt.dsf.gdb;singleton:=true -Bundle-Version: 6.4.0.qualifier +Bundle-Version: 6.4.100.qualifier Bundle-Activator: org.eclipse.cdt.dsf.gdb.internal.GdbPlugin Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/launching/CoreBuildLocalDebugLaunchDelegate.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/launching/CoreBuildLocalDebugLaunchDelegate.java index 8af06ee4fac..aee3a460ec5 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/launching/CoreBuildLocalDebugLaunchDelegate.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/internal/launching/CoreBuildLocalDebugLaunchDelegate.java @@ -59,7 +59,11 @@ public class CoreBuildLocalDebugLaunchDelegate extends CoreBuildLaunchConfigDele } else { locator.initializeFromMemento(memento, configuration); } - + String type = configuration.getAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, (String) null); + if (type == null) { + type = configuration.getType().getSourceLocatorId(); + } + locator.setId(type); launch.setSourceLocator(locator); return launch; } diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java index cd8f447cf89..bf84a51e921 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java @@ -455,6 +455,11 @@ public class GdbLaunchDelegate extends AbstractCLaunchDelegate2 { } else { locator.initializeFromMemento(memento, configuration); } + String type = configuration.getAttribute(ILaunchConfiguration.ATTR_SOURCE_LOCATOR_ID, (String) null); + if (type == null) { + type = configuration.getType().getSourceLocatorId(); + } + locator.setId(type); return locator; }