IEP-965: Bug fix for serial port exception (#772)

The serial ports descriptor was initially split by the hyphen(-) which can be a valid serial port name char as well so instead now we are using the good old trust space( ) char to keep it clean and simple. Also did some ui improvements to help keep the user interface active while background tasks can take a while to resolve.

Author: alirana01

bundles/com.espressif.idf.launch.serial.ui/src/com/espressif/idf/launch/serial/ui/internal/NewSerialFlashTargetWizardPage.java

@@ -53,7 +53,7 @@
 
 public class NewSerialFlashTargetWizardPage extends WizardPage {
 
-	private static final String PORT_NAME_DESCRIPTOR_SPLITOR = "-"; //$NON-NLS-1$
+	private static final String PORT_NAME_DESCRIPTOR_SPLITOR = " "; //$NON-NLS-1$
 	private static final String OS = "esp32"; //$NON-NLS-1$
 	private static final String ARCH = "xtensa"; //$NON-NLS-1$
 
@@ -66,6 +66,7 @@ public class NewSerialFlashTargetWizardPage extends WizardPage {
 	private Map<String, List<String>> targetPortMap;
 	private TargetPortInfo targetPortInfo;
 	private Display display;
+	private String port;
 
 	public NewSerialFlashTargetWizardPage(ILaunchTarget launchTarget) {
 		super(NewSerialFlashTargetWizardPage.class.getName());
@@ -127,10 +128,13 @@ public void createControl(Composite parent) {
 
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				if (targetPortInfo.getState() == Job.RUNNING) {
-					targetPortInfo.cancel();
-				}
-				targetPortInfo.schedule();
+				display.asyncExec(() -> {
+					if (targetPortInfo.getState() == Job.RUNNING) {
+						targetPortInfo.cancel();
+					}
+					port = serialPortCombo.getText().split(PORT_NAME_DESCRIPTOR_SPLITOR)[0];
+					targetPortInfo.schedule();
+				});
 			}
 		});
 		try {
@@ -154,7 +158,7 @@ public void widgetSelected(SelectionEvent e) {
 								.getCommPort(targetPort);
 						targetPort = targetPort + PORT_NAME_DESCRIPTOR_SPLITOR + serialPort.getDescriptivePortName();
 						int i = 0;
-						for (String port : ports) {
+						for (String port : serialPortCombo.getItems()) {
 							if (port.equals(targetPort)) {
 								serialPortCombo.select(i);
 								break;
@@ -265,24 +269,27 @@ public TargetPortInfo(String name) {
 		@Override
 		protected IStatus run(IProgressMonitor monitor) {
 			EspToolCommands espToolCommands = new EspToolCommands();
+
+			String message = String.format(Messages.TargetPortUpdatingMessage, port);
 			display.asyncExec(() -> {
-				try {
-					String port = serialPortCombo.getText().split(PORT_NAME_DESCRIPTOR_SPLITOR)[0];
-					String message = String.format(Messages.TargetPortUpdatingMessage, port);
-					if (infoArea != null && !infoArea.isDisposed())
-						infoArea.append(System.lineSeparator() + message);
-					Process chipInfoProcess = espToolCommands.chipInformation(port);
-					InputStream targetIn = chipInfoProcess.getInputStream();
-					BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(targetIn));
-					StringBuilder chipInfo = new StringBuilder();
-					String readLine;
-					while ((readLine = bufferedReader.readLine()) != null) {
+				if (infoArea != null && !infoArea.isDisposed())
+					infoArea.append(System.lineSeparator() + message);
+			});
+			try {
+				Process chipInfoProcess = espToolCommands.chipInformation(port);
+				InputStream targetIn = chipInfoProcess.getInputStream();
+				BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(targetIn));
+				StringBuilder chipInfo = new StringBuilder();
+				String readLine;
+				while ((readLine = bufferedReader.readLine()) != null) {
+					display.asyncExec(() -> {
 						infoArea.append("."); //$NON-NLS-1$
-						chipInfo.append(readLine);
-						chipInfo.append(System.lineSeparator());
-					}
-					infoArea.append(System.lineSeparator());
-					String chipType = extractChipFromChipInfoOutput(chipInfo.toString());
+					});
+					chipInfo.append(readLine);
+					chipInfo.append(System.lineSeparator());
+				}
+				String chipType = extractChipFromChipInfoOutput(chipInfo.toString());
+				display.asyncExec(() -> {
 					if (StringUtil.isEmpty(chipType)) {
 						if (infoArea != null && !infoArea.isDisposed())
 							infoArea.setText(infoArea.getText() + System.lineSeparator()
@@ -291,11 +298,15 @@ protected IStatus run(IProgressMonitor monitor) {
 						infoArea.append(System.lineSeparator());
 						infoArea.append(String.format(Messages.TargetPortFoundMessage, port, chipType));
 					}
-				} catch (Exception e) {
-					Logger.log(e);
-				}
+				});
+			} catch (Exception e) {
+				Logger.log(e);
+			}
 
+			display.asyncExec(() -> {
+				infoArea.append(System.lineSeparator());
 			});
+
 			return Status.OK_STATUS;
 		}