Add support for Chrome DevTools Protocol for NodeJS Debugging

ide/javascript2.debug.ui/nbproject/project.xml

@@ -190,6 +190,7 @@
             <friend-packages>
                 <friend>org.netbeans.modules.debugger.jpda.jsui</friend>
                 <friend>org.netbeans.modules.debugger.jpda.truffle</friend>
+                <friend>org.netbeans.modules.javascript.cdtdebug.ui</friend>
                 <friend>org.netbeans.modules.javascript.v8debug</friend>
                 <friend>org.netbeans.modules.javascript.v8debug.ui</friend>
                 <friend>org.netbeans.modules.web.javascript.debugger</friend>

ide/javascript2.debug.ui/src/org/netbeans/modules/javascript2/debug/ui/JSUtils.java

@@ -49,13 +49,14 @@ public class JSUtils {
     private static final Logger LOG = Logger.getLogger(JSUtils.class.getName());
 
     public static final String JS_MIME_TYPE = "text/javascript";    // NOI18N
+    public static final String TS_MIME_TYPE = "application/x-typescript";    // NOI18N
 
     public static Line getCurrentLine() {
         FileObject fo = EditorContextDispatcher.getDefault().getCurrentFile();
         if (fo == null) {
             return null;
         }
-        if (!JS_MIME_TYPE.equalsIgnoreCase(fo.getMIMEType())) {
+        if (!JS_MIME_TYPE.equalsIgnoreCase(fo.getMIMEType()) && !TS_MIME_TYPE.equalsIgnoreCase(fo.getMIMEType())) {
             return null;
         }
         return EditorContextDispatcher.getDefault().getCurrentLine();

ide/javascript2.debug.ui/src/org/netbeans/modules/javascript2/debug/ui/breakpoints/JSLineBreakpointType.java

@@ -20,21 +20,22 @@
 
 import javax.swing.JComponent;
 import org.netbeans.modules.javascript2.debug.ui.JSUtils;
-import org.netbeans.modules.javascript2.debug.ui.breakpoints.JSLineBreakpointCustomizerPanel;
 import org.netbeans.spi.debugger.ui.BreakpointType;
 import org.netbeans.spi.debugger.ui.Controller;
 import org.netbeans.spi.debugger.ui.EditorContextDispatcher;
 import org.openide.filesystems.FileObject;
 import org.openide.util.NbBundle;
 
 
-@NbBundle.Messages({"JavaScriptBreakpointTypeCategory=JavaScript",
-    "LineBreakpointTypeName=Line"})
+@NbBundle.Messages({
+    "JavaScriptBreakpointTypeCategory=JavaScript",
+    "LineBreakpointTypeName=Line"
+})
 @BreakpointType.Registration(displayName="#LineBreakpointTypeName")
 public class JSLineBreakpointType extends BreakpointType {
-    
+
     private JSLineBreakpointCustomizerPanel cust;
-    
+
     /* (non-Javadoc)
      * @see org.netbeans.spi.debugger.ui.BreakpointType#getCategoryDisplayName()
      */
@@ -59,7 +60,7 @@ public Controller getController() {
         getCustomizer();
         return cust.getController();
     }
-    
+
     /* (non-Javadoc)
      * @see org.netbeans.spi.debugger.ui.BreakpointType#getTypeDisplayName()
      */
@@ -78,7 +79,7 @@ public boolean isDefault() {
             return false;
         }
         String mimeType = mostRecentFile.getMIMEType();
-        return JSUtils.JS_MIME_TYPE.equals(mimeType);
+        return JSUtils.JS_MIME_TYPE.equals(mimeType) || JSUtils.TS_MIME_TYPE.equals(mimeType);
     }
 
 }

ide/javascript2.debug.ui/src/org/netbeans/modules/javascript2/debug/ui/breakpoints/ToggleBreakpointActionProvider.java

@@ -38,18 +38,23 @@
  *
  * @author Martin
  */
-@ActionsProvider.Registration(actions={"toggleBreakpoint"}, 
-        activateForMIMETypes={JSUtils.JS_MIME_TYPE})
+@ActionsProvider.Registration(
+        actions = {"toggleBreakpoint"},
+        activateForMIMETypes = {JSUtils.JS_MIME_TYPE, JSUtils.TS_MIME_TYPE}
+)
 public class ToggleBreakpointActionProvider extends ActionsProviderSupport
                                             implements PropertyChangeListener {
-    
+
     public ToggleBreakpointActionProvider() {
         setEnabled(ActionsManager.ACTION_TOGGLE_BREAKPOINT, false);
         EditorContextDispatcher.getDefault().addPropertyChangeListener(
                 JSUtils.JS_MIME_TYPE,
                 WeakListeners.propertyChange(this, EditorContextDispatcher.getDefault()));
+        EditorContextDispatcher.getDefault().addPropertyChangeListener(
+                JSUtils.TS_MIME_TYPE,
+                WeakListeners.propertyChange(this, EditorContextDispatcher.getDefault()));
     }
-    
+
     @Override
     public void doAction(Object action) {
         Line line = JSUtils.getCurrentLine();
@@ -61,7 +66,7 @@ public void doAction(Object action) {
         for (Breakpoint breakpoint : d.getBreakpoints()) {
             if (breakpoint instanceof JSLineBreakpoint &&
                 JSUtils.getLine((JSLineBreakpoint) breakpoint).equals(line)) {
-                
+
                 d.removeBreakpoint(breakpoint);
                 add = false;
                 break;

ide/javascript2.debug.ui/src/org/netbeans/modules/javascript2/debug/ui/models/ViewModelSupport.java

@@ -36,11 +36,11 @@
 public abstract class ViewModelSupport {
 
     protected static final Object[] EMPTY_CHILDREN = new Object[]{};
-    
-    private CopyOnWriteArrayList<ModelListener> myListeners;
-    
+
+    private final CopyOnWriteArrayList<ModelListener> myListeners;
+
     protected ViewModelSupport() {
-        myListeners = new CopyOnWriteArrayList<ModelListener>();
+        myListeners = new CopyOnWriteArrayList<>();
     }
 
     public final void addModelListener(ModelListener l) {
@@ -72,8 +72,7 @@ protected final void fireChangeEvents(Collection<ModelEvent> events) {
             fireChangeEvent( event );
         }
     }
-
-
+
     public static String toHTML(String text) {
         return toHTML(text, false, false, null);
     }
@@ -84,28 +83,39 @@ public static String toHTML(String text, boolean bold, boolean italics,
         if (text.length() > 6 && text.substring(0, 6).equalsIgnoreCase("<html>")) {
             return text; // Already HTML
         }
-        StringBuffer sb = new StringBuffer ();
-        sb.append ("<html>");
-        if (bold) sb.append ("<b>");
-        if (italics) sb.append ("<i>");
-        if (color == null) {
-            color = UIManager.getColor("Table.foreground");
-            if (color == null) {
-                color = new JTable().getForeground();
+        StringBuilder sb = new StringBuilder();
+        sb.append("<html>");
+        if (bold) {
+            sb.append("<b>");
+        }
+        if (italics) {
+            sb.append("<i>");
+        }
+        Color fontColor = color;
+        if (fontColor == null) {
+            fontColor = UIManager.getColor("Table.foreground");
+            if (fontColor == null) {
+                fontColor = new JTable().getForeground();
             }
         }
-        sb.append ("<font color=");
-        sb.append (Integer.toHexString ((color.getRGB () & 0xffffff)));
-        sb.append (">");
-        text = text.replace ("&", "&amp;");
-        text = text.replace ("<", "&lt;");
-        text = text.replace (">", "&gt;");
-        sb.append (text);
-        sb.append ("</font>");
-        if (italics) sb.append ("</i>");
-        if (bold) sb.append ("</b>");
-        sb.append ("</html>");
+        sb.append("<font color=\"");
+        sb.append(String.format(
+                "#%02x%02x%02x",
+                fontColor.getRed(),
+                fontColor.getGreen(),
+                fontColor.getBlue()
+        ));
+        sb.append("\">");
+        sb.append(text.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;"));
+        sb.append("</font>");
+        if (italics) {
+            sb.append("</i>");
+        }
+        if (bold) {
+            sb.append("</b>");
+        }
+        sb.append("</html>");
         return sb.toString ();
     }
-    
+
 }

ide/javascript2.debug.ui/src/org/netbeans/modules/javascript2/debug/ui/models/breakpoints/BreakpointNodeModel.java

@@ -19,6 +19,7 @@
 
 package org.netbeans.modules.javascript2.debug.ui.models.breakpoints;
 
+import java.awt.Color;
 import java.awt.datatransfer.Transferable;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -30,6 +31,7 @@
 import org.netbeans.modules.javascript2.debug.breakpoints.JSBreakpointStatus;
 import org.netbeans.modules.javascript2.debug.breakpoints.JSBreakpointsInfoManager;
 import org.netbeans.modules.javascript2.debug.breakpoints.JSLineBreakpoint;
+import org.netbeans.modules.javascript2.debug.ui.models.ViewModelSupport;
 import org.netbeans.spi.debugger.DebuggerServiceRegistration;
 import org.netbeans.spi.viewmodel.ExtendedNodeModel;
 import org.netbeans.spi.viewmodel.ModelEvent;
@@ -90,7 +92,13 @@ public String getDisplayName(Object node) throws UnknownTypeException {
             JSLineBreakpoint breakpoint = (JSLineBreakpoint) node;
             String fileName = JSUtils.getFileName(breakpoint);
             int lineNumber = breakpoint.getLineNumber();
-            return Bundle.LBL_LineBreakpoint_on(fileName + ":" + lineNumber);
+            if(breakpoint.isActive()) {
+                return ViewModelSupport.toHTML(
+                        Bundle.LBL_LineBreakpoint_on(fileName + ":" + lineNumber),
+                        true, false, null);
+            } else {
+                return Bundle.LBL_LineBreakpoint_on(fileName + ":" + lineNumber);
+            }
         }
         throw new UnknownTypeException(node);
     }
@@ -112,7 +120,7 @@ public String getIconBaseWithExtension(Object node) throws UnknownTypeException
                 iconBase = DEACTIVATED_DISABLED_LINE_BREAKPOINT;
             }
         } else {
-            if (b == JSBreakpointStatus.getActive()) {
+            if (b.isActive()) {
                 iconBase = CURRENT_LINE_BREAKPOINT;
             } else {
                 if (active) {

ide/javascript2.debug/nbproject/project.xml

@@ -115,6 +115,8 @@
                 <friend>org.netbeans.modules.debugger.jpda.js</friend>
                 <friend>org.netbeans.modules.debugger.jpda.truffle</friend>
                 <friend>org.netbeans.modules.java.lsp.server</friend>
+                <friend>org.netbeans.modules.javascript.cdtdebug</friend>
+                <friend>org.netbeans.modules.javascript.cdtdebug.ui</friend>
                 <friend>org.netbeans.modules.javascript.v8debug</friend>
                 <friend>org.netbeans.modules.javascript.v8debug.ui</friend>
                 <friend>org.netbeans.modules.javascript2.debug.ui</friend>

ide/javascript2.debug/src/org/netbeans/modules/javascript2/debug/breakpoints/JSBreakpointStatus.java

@@ -52,7 +52,14 @@ public static final void resetValidity(JSLineBreakpoint lb) {
      */
     public static void setActive(JSLineBreakpoint lb) {
         synchronized (JSBreakpointStatus.class) {
+            JSLineBreakpoint oldBreakpoint = activeBPRef.get();
+            if(oldBreakpoint != null) {
+                oldBreakpoint.setActive(false);
+            }
             activeBPRef = new WeakReference<>(lb);
+            if(lb != null) {
+                lb.setActive(true);
+            }
         }
     }
 

ide/javascript2.debug/src/org/netbeans/modules/javascript2/debug/breakpoints/JSLineBreakpoint.java

@@ -22,6 +22,7 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.net.URL;
+import java.util.Objects;
 import org.netbeans.api.debugger.Breakpoint;
 import org.netbeans.api.debugger.DebuggerManager;
 import org.netbeans.modules.javascript2.debug.EditorLineHandler;
@@ -56,9 +57,11 @@ public class JSLineBreakpoint extends Breakpoint {
      */
     public static final String PROP_FILE = "fileChanged";           // NOI18N
     public static final String PROP_CONDITION = "condition";
-
+    public static final String PROP_ACTIVE = "active";
+
     private EditorLineHandler line;
     private boolean isEnabled = true;
+    private boolean active = false;
     private volatile String condition;
     private final FileRemoveListener myListener = new FileRemoveListener();
     private FileChangeListener myWeakListener;
@@ -166,7 +169,20 @@ public void enable() {
     public boolean isEnabled() {
         return isEnabled;
     }
-
+
+    final void setActive(boolean active) {
+        boolean oldActive = this.active;
+        if(Objects.equals(oldActive, active)) {
+            return;
+        }
+        this.active = active;
+        firePropertyChange(PROP_ACTIVE, oldActive, this.active);
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
     @Override
     protected void dispose() {
         super.dispose();

ide/javascript2.debug/src/org/netbeans/modules/javascript2/debug/sources/SourceFilesCache.java

@@ -21,6 +21,7 @@
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.Objects;
 import org.openide.filesystems.FileObject;
 
 /**
@@ -48,7 +49,12 @@ public URL getSourceFile(String name, int hash, String content) {
     }
 
     public URL getSourceFile(String name, int hash, SourceContent content) {
-        String path = Integer.toHexString(hash) + '/' + name;
+        return getSourceFile(name, Integer.toHexString(hash), content);
+    }
+
+    public URL getSourceFile(String name, String hash, SourceContent content) {
+        Objects.requireNonNull(hash, "hash was null");
+        String path = hash + '/' + name;
         FileObject fo = fs.findResource(path);
         if (fo == null) {
             fo = fs.createFile(path, content);

ide/web.common/nbproject/project.xml

@@ -221,6 +221,8 @@
                 <friend>org.netbeans.modules.javaee.project</friend>
                 <friend>org.netbeans.modules.javascript.bower</friend>
                 <friend>org.netbeans.modules.javascript.cdnjs</friend>
+                <friend>org.netbeans.modules.javascript.cdtdebug</friend>
+                <friend>org.netbeans.modules.javascript.cdtdebug.ui</friend>
                 <friend>org.netbeans.modules.javascript.grunt</friend>
                 <friend>org.netbeans.modules.javascript.gulp</friend>
                 <friend>org.netbeans.modules.javascript.jstestdriver</friend>

ide/web.common/src/org/netbeans/modules/web/common/sourcemap/SourceMapsTranslator.java

@@ -137,7 +137,7 @@ static FileObject getSourceFile(String sourcePath, FileObject parentFolder) {
         }
 
         public FileObject getFile() {
-            if (file == null) {
+            if (file == null && parentFolder != null && mapping != null) {
                 int sourceIndex = mapping.getSourceIndex();
                 String sourcePath = sourceMap.getSourcePath(sourceIndex);
                 file = getSourceFile(sourcePath, parentFolder);

ide/web.common/src/org/netbeans/modules/web/common/sourcemap/SourceMapsTranslatorImpl.java

@@ -22,6 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -100,7 +101,7 @@ private DirectMapping getMapping(FileObject source, String sourceMapFileName, So
             if (sourceMapFileName == null && sm == null) {
                 String lastLine = null;
                 try {
-                    List<String> lines = source.asLines();
+                    List<String> lines = source == null ? Collections.emptyList() : source.asLines();
                     if (!lines.isEmpty()) {
                         lastLine = lines.get(lines.size() - 1);
                     }

java/debugger.jpda.trufflenode/manifest.mf

@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: false
 OpenIDE-Module: org.netbeans.modules.debugger.jpda.trufflenode/1
+OpenIDE-Module-Layer: org/netbeans/modules/debugger/jpda/truffle/node/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/truffle/node/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.21
 OpenIDE-Module-Recommends: org.netbeans.modules.debugger.jpda.truffle

java/debugger.jpda.trufflenode/nbproject/project.xml

@@ -52,15 +52,6 @@
                         <specification-version>1.52</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.extexecution</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>1.48</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.java.j2seplatform</code-name-base>
                     <build-prerequisite/>

java/debugger.jpda.trufflenode/src/org/netbeans/modules/debugger/jpda/truffle/node/Bundle.properties

@@ -20,3 +20,4 @@ OpenIDE-Module-Name=GraalVM Node.js Debugging Support
 OpenIDE-Module-Display-Category=Web
 OpenIDE-Module-Short-Description=Supports Node.js Debugging on GraalVM
 OpenIDE-Module-Long-Description=Supports debugging of Node.js based on top of GraalVM.
+NodeJsDebuggerName=GraalVM via JPDA