IEP-925 2.9.1 project combo is empty and launch can throw an exception (#739)

sigmaaa · web-flow · commit 8235d2755a20 · 2023-04-06T13:44:00.000+05:30
* fix combo is empty and launch exception

* default project selection fix

* fix: can't change default toolchain for target

* fix problem with jtag/uart flash
diff --git a/bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/IDFBuildConfiguration.java b/bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/IDFBuildConfiguration.java
@@ -54,6 +54,7 @@
 import org.eclipse.cdt.core.IConsoleParser2;
 import org.eclipse.cdt.core.build.CBuildConfiguration;
 import org.eclipse.cdt.core.build.IToolChain;
+import org.eclipse.cdt.core.build.IToolChainManager;
 import org.eclipse.cdt.core.envvar.EnvironmentVariable;
 import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
 import org.eclipse.cdt.core.index.IIndexManager;
@@ -141,8 +142,6 @@ public IDFBuildConfiguration(IBuildConfiguration config, String name) throws Cor
 	{
 		super(config, name);
 		buildConfiguration = config;
-		ICMakeToolChainManager manager = IDFCorePlugin.getService(ICMakeToolChainManager.class);
-		this.toolChainFile = manager.getToolChainFileFor(getToolChain());
 	}
 
 	public IDFBuildConfiguration(IBuildConfiguration config, String name, IToolChain toolChain)
@@ -266,8 +265,10 @@ private IBinary[] getBuildOutput(final IBinaryContainer binaries, final IPath ou
 				.toArray(IBinary[]::new);
 	}
 
-	public ICMakeToolChainFile getToolChainFile()
+	public ICMakeToolChainFile getToolChainFile() throws CoreException
 	{
+		ICMakeToolChainManager manager = IDFCorePlugin.getService(ICMakeToolChainManager.class);
+		this.toolChainFile = manager.getToolChainFileFor(getToolChain());
 		return toolChainFile;
 	}
 
@@ -799,6 +800,14 @@ private IFolder getIDFComponentsFolder() throws CoreException
 		return folder;
 	}
 
+	@Override
+	public IToolChain getToolChain() throws CoreException
+	{
+		String typeId = getProperty(TOOLCHAIN_TYPE);
+		String id = getProperty(TOOLCHAIN_ID);
+		IToolChainManager toolChainManager = CCorePlugin.<IToolChainManager>getService(IToolChainManager.class);
+		return toolChainManager.getToolChain(typeId, id);
+	}
 	private static IPath getComponentsPath()
 	{
 		return new org.eclipse.core.runtime.Path(IDFConstants.BUILD_FOLDER).append("ide").append(ESP_IDF_COMPONENTS); //$NON-NLS-1$
diff --git a/bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/IDFBuildConfigurationProvider.java b/bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/IDFBuildConfigurationProvider.java
@@ -60,6 +60,10 @@ public synchronized ICBuildConfiguration getCBuildConfiguration(IBuildConfigurat
 			try
 			{
 				ILaunchTarget target = barManager.getActiveLaunchTarget();
+				if (target == null)
+				{
+					return null;
+				}
 				for (IToolChain tc : toolChainManager.getToolChainsMatching(target.getAttributes()))
 				{
 					if (tc instanceof AbstractESPToolchain)
diff --git a/bundles/com.espressif.idf.launch.serial.core/src/com/espressif/idf/launch/serial/internal/SerialFlashLaunchConfigDelegate.java b/bundles/com.espressif.idf.launch.serial.core/src/com/espressif/idf/launch/serial/internal/SerialFlashLaunchConfigDelegate.java
@@ -42,13 +42,15 @@
 import org.eclipse.embedcdt.core.EclipseUtils;
 import org.eclipse.embedcdt.core.StringUtils;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.launchbar.core.ILaunchBarManager;
 import org.eclipse.launchbar.core.target.ILaunchTarget;
 import org.eclipse.launchbar.core.target.ILaunchTargetManager;
 import org.eclipse.launchbar.core.target.launch.ITargetedLaunch;
 import org.eclipse.launchbar.ui.internal.Activator;
 import org.eclipse.launchbar.ui.target.ILaunchTargetUIManager;
 import org.eclipse.swt.widgets.Display;
 
+import com.espressif.idf.core.IDFCorePlugin;
 import com.espressif.idf.core.IDFEnvironmentVariables;
 import com.espressif.idf.core.build.IDFLaunchConstants;
 import com.espressif.idf.core.logging.Logger;
@@ -75,6 +77,10 @@ public class SerialFlashLaunchConfigDelegate extends CoreBuildGenericLaunchConfi
 	@Override
 	public ITargetedLaunch getLaunch(ILaunchConfiguration configuration, String mode, ILaunchTarget target)
 			throws CoreException {
+		if (target == null) {
+			ILaunchBarManager barManager = IDFCorePlugin.getService(ILaunchBarManager.class);
+			target = barManager.getActiveLaunchTarget();
+		}
 		return new SerialFlashLaunch(configuration, mode, null, target);
 	}
 
@@ -131,7 +137,7 @@ protected void launchInternal(ILaunchConfiguration configuration, String mode, I
 		if (checkIfPortIsEmpty(configuration)) {
 			return;
 		}
-		String arguments = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_TOOL_ARGUMENTS,
+		String arguments = configuration.getAttribute(IDFLaunchConstants.ATTR_SERIAL_FLASH_ARGUMENTS,
 				espFlashCommand);
 		arguments = arguments.replace(ESPFlashUtil.SERIAL_PORT, serialPort);
 		if (!arguments.isEmpty()) {
@@ -177,7 +183,7 @@ protected void flashOverJtag(ILaunchConfiguration configuration, ILaunch launch)
 		openocdExe = openocdExe.replace(DEFAULT_PATH, tmp);
 		commands.add(openocdExe);
 
-		String arguments = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_TOOL_ARGUMENTS, ""); //$NON-NLS-1$
+		String arguments = configuration.getAttribute(IDFLaunchConstants.ATTR_JTAG_FLASH_ARGUMENTS, ""); //$NON-NLS-1$
 		arguments = arguments.replace(DEFAULT_PATH, tmp).trim();
 		commands.addAll(StringUtils.splitCommandLineOptions(arguments));
 
diff --git a/bundles/com.espressif.idf.terminal.connector.serial/src/com/espressif/idf/terminal/connector/serial/controls/SerialSettingsPage.java b/bundles/com.espressif.idf.terminal.connector.serial/src/com/espressif/idf/terminal/connector/serial/controls/SerialSettingsPage.java
@@ -17,7 +17,6 @@
 import java.util.Optional;
 
 import org.eclipse.cdt.serial.SerialPort;
-import org.eclipse.core.resources.IBuildConfiguration;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -38,7 +37,7 @@
 import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer;
 import org.osgi.service.prefs.Preferences;
 
-import com.espressif.idf.core.build.IDFBuildConfigurationProvider;
+import com.espressif.idf.core.IDFProjectNature;
 import com.espressif.idf.core.logging.Logger;
 import com.espressif.idf.core.util.StringUtil;
 import com.espressif.idf.terminal.connector.serial.activator.Activator;
@@ -105,9 +104,7 @@ public void createControl(Composite parent)
 		{
 			try
 			{
-				IBuildConfiguration activeBuildConfig = project.getActiveBuildConfig();
-				if (activeBuildConfig != null
-						&& activeBuildConfig.getName().startsWith(IDFBuildConfigurationProvider.ID))
+				if (project.hasNature(IDFProjectNature.ID))
 				{
 					projectCombo.add(project.getName());
 				}
diff --git a/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/EclipseUtil.java b/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/EclipseUtil.java
@@ -17,7 +17,7 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
-import com.espressif.idf.core.build.IDFBuildConfigurationProvider;
+import com.espressif.idf.core.IDFProjectNature;
 import com.espressif.idf.core.logging.Logger;
 
 /**
@@ -70,8 +70,7 @@ public static IProject getSelectedIDFProjectInExplorer()
 		IProject project = getSelectedProject(IPageLayout.ID_PROJECT_EXPLORER);
 		try
 		{
-			if (project != null && project.getActiveBuildConfig() != null
-					&& project.getActiveBuildConfig().getName().startsWith(IDFBuildConfigurationProvider.ID))
+			if (project != null && project.hasNature(IDFProjectNature.ID))
 			{
 				return project;
 			}
@@ -94,10 +93,10 @@ private static IProject getSelectedProject(String viewID)
 		IStructuredSelection structured = (IStructuredSelection) service.getSelection(viewID);
 		if (structured instanceof IStructuredSelection)
 		{
-			Object selectedObject = ((IStructuredSelection) structured).getFirstElement();
+			Object selectedObject = structured.getFirstElement();
 			if (selectedObject instanceof IAdaptable)
 			{
-				IResource resource = (IResource) ((IAdaptable) selectedObject).getAdapter(IResource.class);
+				IResource resource = ((IAdaptable) selectedObject).getAdapter(IResource.class);
 				if (resource != null)
 				{
 					return resource.getProject();

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@`
`54`	`54`	`import org.eclipse.cdt.core.IConsoleParser2;`
`55`	`55`	`import org.eclipse.cdt.core.build.CBuildConfiguration;`
`56`	`56`	`import org.eclipse.cdt.core.build.IToolChain;`
	`57`	`+import org.eclipse.cdt.core.build.IToolChainManager;`
`57`	`58`	`import org.eclipse.cdt.core.envvar.EnvironmentVariable;`
`58`	`59`	`import org.eclipse.cdt.core.envvar.IEnvironmentVariable;`
`59`	`60`	`import org.eclipse.cdt.core.index.IIndexManager;`
`@@ -141,8 +142,6 @@ public IDFBuildConfiguration(IBuildConfiguration config, String name) throws Cor`
`141`	`142`	`{`
`142`	`143`	`super(config, name);`
`143`	`144`	`buildConfiguration = config;`
`144`		`- ICMakeToolChainManager manager = IDFCorePlugin.getService(ICMakeToolChainManager.class);`
`145`		`- this.toolChainFile = manager.getToolChainFileFor(getToolChain());`
`146`	`145`	`}`
`147`	`146`
`148`	`147`	`public IDFBuildConfiguration(IBuildConfiguration config, String name, IToolChain toolChain)`
`@@ -266,8 +265,10 @@ private IBinary[] getBuildOutput(final IBinaryContainer binaries, final IPath ou`
`266`	`265`	`.toArray(IBinary[]::new);`
`267`	`266`	`}`
`268`	`267`
`269`		`- public ICMakeToolChainFile getToolChainFile()`
	`268`	`+ public ICMakeToolChainFile getToolChainFile() throws CoreException`
`270`	`269`	`{`
	`270`	`+ ICMakeToolChainManager manager = IDFCorePlugin.getService(ICMakeToolChainManager.class);`
	`271`	`+ this.toolChainFile = manager.getToolChainFileFor(getToolChain());`
`271`	`272`	`return toolChainFile;`
`272`	`273`	`}`
`273`	`274`
`@@ -799,6 +800,14 @@ private IFolder getIDFComponentsFolder() throws CoreException`
`799`	`800`	`return folder;`
`800`	`801`	`}`
`801`	`802`
	`803`	`+ @Override`
	`804`	`+ public IToolChain getToolChain() throws CoreException`
	`805`	`+ {`
	`806`	`+ String typeId = getProperty(TOOLCHAIN_TYPE);`
	`807`	`+ String id = getProperty(TOOLCHAIN_ID);`
	`808`	`+ IToolChainManager toolChainManager = CCorePlugin.<IToolChainManager>getService(IToolChainManager.class);`
	`809`	`+ return toolChainManager.getToolChain(typeId, id);`
	`810`	`+ }`
`802`	`811`	`private static IPath getComponentsPath()`
`803`	`812`	`{`
`804`	`813`	`return new org.eclipse.core.runtime.Path(IDFConstants.BUILD_FOLDER).append("ide").append(ESP_IDF_COMPONENTS); //$NON-NLS-1$`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,10 @@ public synchronized ICBuildConfiguration getCBuildConfiguration(IBuildConfigurat`
`60`	`60`	`try`
`61`	`61`	`{`
`62`	`62`	`ILaunchTarget target = barManager.getActiveLaunchTarget();`
	`63`	`+ if (target == null)`
	`64`	`+ {`
	`65`	`+ return null;`
	`66`	`+ }`
`63`	`67`	`for (IToolChain tc : toolChainManager.getToolChainsMatching(target.getAttributes()))`
`64`	`68`	`{`
`65`	`69`	`if (tc instanceof AbstractESPToolchain)`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`import java.util.Optional;`
`18`	`18`
`19`	`19`	`import org.eclipse.cdt.serial.SerialPort;`
`20`		`-import org.eclipse.core.resources.IBuildConfiguration;`
`21`	`20`	`import org.eclipse.core.resources.IProject;`
`22`	`21`	`import org.eclipse.core.resources.ResourcesPlugin;`
`23`	`22`	`import org.eclipse.core.runtime.CoreException;`
`@@ -38,7 +37,7 @@`
`38`	`37`	`import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer;`
`39`	`38`	`import org.osgi.service.prefs.Preferences;`
`40`	`39`
`41`		`-import com.espressif.idf.core.build.IDFBuildConfigurationProvider;`
	`40`	`+import com.espressif.idf.core.IDFProjectNature;`
`42`	`41`	`import com.espressif.idf.core.logging.Logger;`
`43`	`42`	`import com.espressif.idf.core.util.StringUtil;`
`44`	`43`	`import com.espressif.idf.terminal.connector.serial.activator.Activator;`
`@@ -105,9 +104,7 @@ public void createControl(Composite parent)`
`105`	`104`	`{`
`106`	`105`	`try`
`107`	`106`	`{`
`108`		`- IBuildConfiguration activeBuildConfig = project.getActiveBuildConfig();`
`109`		`- if (activeBuildConfig != null`
`110`		`- && activeBuildConfig.getName().startsWith(IDFBuildConfigurationProvider.ID))`
	`107`	`+ if (project.hasNature(IDFProjectNature.ID))`
`111`	`108`	`{`
`112`	`109`	`projectCombo.add(project.getName());`
`113`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`import org.eclipse.ui.IWorkbenchWindow;`
`18`	`18`	`import org.eclipse.ui.PlatformUI;`
`19`	`19`
`20`		`-import com.espressif.idf.core.build.IDFBuildConfigurationProvider;`
	`20`	`+import com.espressif.idf.core.IDFProjectNature;`
`21`	`21`	`import com.espressif.idf.core.logging.Logger;`
`22`	`22`
`23`	`23`	`/**`
`@@ -70,8 +70,7 @@ public static IProject getSelectedIDFProjectInExplorer()`
`70`	`70`	`IProject project = getSelectedProject(IPageLayout.ID_PROJECT_EXPLORER);`
`71`	`71`	`try`
`72`	`72`	`{`
`73`		`- if (project != null && project.getActiveBuildConfig() != null`
`74`		`- && project.getActiveBuildConfig().getName().startsWith(IDFBuildConfigurationProvider.ID))`
	`73`	`+ if (project != null && project.hasNature(IDFProjectNature.ID))`
`75`	`74`	`{`
`76`	`75`	`return project;`
`77`	`76`	`}`
`@@ -94,10 +93,10 @@ private static IProject getSelectedProject(String viewID)`
`94`	`93`	`IStructuredSelection structured = (IStructuredSelection) service.getSelection(viewID);`
`95`	`94`	`if (structured instanceof IStructuredSelection)`
`96`	`95`	`{`
`97`		`- Object selectedObject = ((IStructuredSelection) structured).getFirstElement();`
	`96`	`+ Object selectedObject = structured.getFirstElement();`
`98`	`97`	`if (selectedObject instanceof IAdaptable)`
`99`	`98`	`{`
`100`		`- IResource resource = (IResource) ((IAdaptable) selectedObject).getAdapter(IResource.class);`
	`99`	`+ IResource resource = ((IAdaptable) selectedObject).getAdapter(IResource.class);`
`101`	`100`	`if (resource != null)`
`102`	`101`	`{`
`103`	`102`	`return resource.getProject();`