JS CDT Debugger: Improve handling of paths

Breaking change: URL fields in CDT protocol may hold urls and "names", the latter are incompatible with URLs Closes: #7797
apache · Nov 1, 2024 · 8d789ca · 8d789ca
1 parent 1efc17e
commit 8d789ca
Show file tree

Hide file tree

Showing 19 changed files with 229 additions and 293 deletions.
diff --git a/webcommon/javascript.cdtdebug.ui/nbproject/project.properties b/webcommon/javascript.cdtdebug.ui/nbproject/project.properties
@@ -19,4 +19,4 @@ javac.release=11
 javadoc.arch=${basedir}/arch.xml
 
 is.eager=true
-spec.version.base=1.3.0
+spec.version.base=1.4.0
diff --git a/webcommon/javascript.cdtdebug.ui/nbproject/project.xml b/webcommon/javascript.cdtdebug.ui/nbproject/project.xml
@@ -48,8 +48,8 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
+                        <release-version>2</release-version>
+                        <specification-version>2.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

diff --git a/...c/org/netbeans/modules/javascript/cdtdebug/ui/annotation/CallStackAnnotationListener.java b/...c/org/netbeans/modules/javascript/cdtdebug/ui/annotation/CallStackAnnotationListener.java
@@ -184,7 +184,7 @@ public void notifyCurrentFrame(CallFrame cf) {
                 return ;
             }
             topFrameShown = false;
-            EditorUtils.showFrameLine(dbg, cf, true);
+            annotationProcessor.execute(() -> EditorUtils.showFrameLine(dbg, cf, true));
         }
 
         @Override

diff --git a/...pt.cdtdebug.ui/src/org/netbeans/modules/javascript/cdtdebug/ui/models/DebuggingModel.java b/...pt.cdtdebug.ui/src/org/netbeans/modules/javascript/cdtdebug/ui/models/DebuggingModel.java
@@ -22,6 +22,8 @@
 import java.awt.datatransfer.Transferable;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.List;
 import org.netbeans.lib.chrome_devtools_protocol.debugger.CallFrame;
 import org.netbeans.modules.javascript.cdtdebug.CDTDebugger;
@@ -189,7 +191,16 @@ public String getDisplayName(Object node) throws UnknownTypeException {
     static String getScriptName(ScriptsHandler scriptsHandler, CallFrame cf) {
         CDTScript script = scriptsHandler.getScript(cf.getLocation().getScriptId());
         if (script != null) {
-            String scriptName = script.getUrl().getPath();
+            String urlString = script.getUrl();
+            String scriptName = urlString;
+            try {
+                URI url = new URI(urlString);
+                if(url.getPath() != null) {
+                    scriptName = url.getPath();
+                }
+            } catch (URISyntaxException ex) {
+                return urlString;
+            }
             if (scriptName == null) {
                 return null;
             }

diff --git a/webcommon/javascript.cdtdebug/nbproject/project.properties b/webcommon/javascript.cdtdebug/nbproject/project.properties
@@ -19,4 +19,4 @@ javac.release=11
 javadoc.arch=${basedir}/arch.xml
 
 is.autoload=true
-spec.version.base=1.3.0
+spec.version.base=1.4.0
diff --git a/webcommon/javascript.cdtdebug/nbproject/project.xml b/webcommon/javascript.cdtdebug/nbproject/project.xml
@@ -56,8 +56,8 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
+                        <release-version>2</release-version>
+                        <specification-version>2.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

diff --git a/webcommon/javascript.cdtdebug/src/org/netbeans/modules/javascript/cdtdebug/CDTScript.java b/webcommon/javascript.cdtdebug/src/org/netbeans/modules/javascript/cdtdebug/CDTScript.java
@@ -18,14 +18,13 @@
  */
 package org.netbeans.modules.javascript.cdtdebug;
 
-import java.net.URI;
 import java.util.Objects;
 import org.netbeans.lib.chrome_devtools_protocol.debugger.ScriptFailedToParse;
 import org.netbeans.lib.chrome_devtools_protocol.debugger.ScriptParsed;
 
 public class CDTScript {
     private final String scriptId;
-    private final URI url;
+    private final String url;
     private final int startLine;
     private final int startColumn;
     private final int endLine;
@@ -59,7 +58,7 @@ public String getScriptId() {
         return scriptId;
     }
 
-    public URI getUrl() {
+    public String getUrl() {
         return url;
     }