GoToSource - fixed external viewer command parameter, fixed parsing subpaths, VIM replaced by Kate

Author: jisedlac

plugins/sources/src/org/graalvm/visualvm/sources/arguments/SourceRootsArgument.java

@@ -24,7 +24,6 @@
  */
 package org.graalvm.visualvm.sources.arguments;
 
-import java.io.File;
 import org.graalvm.visualvm.sources.impl.SourceRoots;
 import org.netbeans.api.sendopts.CommandException;
 import org.netbeans.spi.sendopts.Option;
@@ -50,7 +49,7 @@ static void process(String[] values) throws CommandException {
     static final void setValue(String value) {
         if (value != null) value = value.trim();
         if (value == null || value.isEmpty()) SourceRoots.forceRoots(null);
-        else SourceRoots.forceRoots(value.split(File.pathSeparator));
+        else SourceRoots.forceRoots(SourceRoots.splitRoots(value));
     }
 
 }

plugins/sources/src/org/graalvm/visualvm/sources/impl/SourceRoots.java

@@ -24,6 +24,9 @@
  */
 package org.graalvm.visualvm.sources.impl;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Pattern;
 import org.graalvm.visualvm.sources.SourcesRoot;
 import org.openide.util.NbPreferences;
@@ -68,4 +71,37 @@ public static boolean areForcedRoots() {
         return FORCED_ROOTS != null;
     }
 
+    
+    public static String[] splitRoots(String rootsString) {
+        List<String> roots = new ArrayList();
+        
+        int position = 0;
+        int length = rootsString.length();
+        
+        boolean inBlock = false;
+        StringBuilder sb = new StringBuilder();
+
+        while (position < length) {
+            char currentChar = rootsString.charAt(position);
+            
+            if (currentChar == '[') {                                           // NOI18N
+                inBlock = true;
+            } else if (currentChar == ']') {                                    // NOI18N
+                inBlock = false;
+            }
+            
+            if (!inBlock && currentChar == File.pathSeparatorChar) {
+                roots.add(sb.toString());
+                sb.setLength(0);
+            } else {
+                sb.append(currentChar);
+                if (position == length - 1) roots.add(sb.toString());
+            }
+            
+            position++;
+        }
+        
+        return roots.toArray(new String[0]);
+    }
+    
 }

plugins/sources/src/org/graalvm/visualvm/sources/viewer/ExternalSourcesViewer.java

@@ -125,7 +125,7 @@ private static enum ToolPreset {
         NOTEPADPP("Notepad++", "notepad++ -p" + SourceHandle.Feature.OFFSET.getCode() + " " + SourceHandle.Feature.FILE.getCode()), // NOI18N
         GEDIT("Gedit", "gedit +" + SourceHandle.Feature.LINE.getCode() + " " + SourceHandle.Feature.FILE.getCode()), // NOI18N
         EMACS("Emacs", "emacs +" + SourceHandle.Feature.LINE.getCode() + ":" + SourceHandle.Feature.COLUMN.getCode() + " " + SourceHandle.Feature.FILE.getCode()), // NOI18N
-        VIM("Vim", "vim " + SourceHandle.Feature.FILE.getCode() + " +" + SourceHandle.Feature.LINE.getCode()); // NOI18N
+        KATE("Kate", "kate -l " + SourceHandle.Feature.LINE.getCode() + " -c " + SourceHandle.Feature.COLUMN.getCode() + " " + SourceHandle.Feature.FILE.getCode()); // NOI18N
 
         private final String name;
         private final String command;
@@ -216,8 +216,15 @@ private static void executeCommand(SourceHandle handle, String commandS) {
 
         for (int i = 0; i < commandL.size(); i++) {
             String commandI = commandL.get(i);
-            commandI = handle.expandFeatures(commandI);
-            commandL.set(i, commandI);
+            if (i == 0) { // first command should be path to viewer executable
+                if (commandI.startsWith("\"") && commandI.endsWith("\"")) {     // NOI18N
+                    commandI = commandI.substring(1, commandI.length() - 1);
+                    commandL.set(i, commandI);
+                }
+            } else { // other commands may be feature wildcards
+                commandI = handle.expandFeatures(commandI);
+                commandL.set(i, commandI);
+            }
         }
 
         new ExternalViewerLauncher(commandL) {