From 15b00032cea865801ba203c471742e41b20f9bfe Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Mon, 12 Aug 2019 17:10:38 -0400 Subject: [PATCH] Bug 542488: Convert URL to path properly on Windows Change-Id: I63a5c3e260583b4df82e4c5bf8fbbdf3e5958e54 --- .../src/org/eclipse/cdt/debug/dap/DapLaunchDelegate.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.dap/src/org/eclipse/cdt/debug/dap/DapLaunchDelegate.java b/debug/org.eclipse.cdt.debug.dap/src/org/eclipse/cdt/debug/dap/DapLaunchDelegate.java index 05659f29119..19eff8a437b 100644 --- a/debug/org.eclipse.cdt.debug.dap/src/org/eclipse/cdt/debug/dap/DapLaunchDelegate.java +++ b/debug/org.eclipse.cdt.debug.dap/src/org/eclipse/cdt/debug/dap/DapLaunchDelegate.java @@ -10,8 +10,10 @@ *******************************************************************************/ package org.eclipse.cdt.debug.dap; +import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.net.URISyntaxException; import java.net.URL; import java.util.Collections; import java.util.HashMap; @@ -89,7 +91,7 @@ public class DapLaunchDelegate extends AbstractCLaunchDelegate2 { throw new IOException( Messages.DapLaunchDelegate_missing_debugAdapter_script + Activator.PLUGIN_ID + debugAdapterJs); } - String path = fileURL.getPath(); + String path = new File(fileURL.toURI()).toString(); List debugCmdArgs = Collections.singletonList(path); DSPLaunchDelegateLaunchBuilder builder = new DSPLaunchDelegateLaunchBuilder(configuration, mode, launch, @@ -111,7 +113,7 @@ public class DapLaunchDelegate extends AbstractCLaunchDelegate2 { } }; dspLaunchDelegate.launch(builder); - } catch (IOException e) { + } catch (IOException | URISyntaxException e) { IStatus errorStatus = new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e); Activator.getDefault().getLog().log(errorStatus); Display.getDefault().asyncExec(() -> {