Merge pull request #15724 from phillip-kruger/log-to-ide

Added netbeans to the supported IDEs in DEV UI's ability to open in IDE
quarkusio · Mar 15, 2021 · 7a2b463 · 7a2b463
2 parents 397eafb + f078f99
commit 7a2b463
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 15 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ide/Ide.java b/core/deployment/src/main/java/io/quarkus/deployment/ide/Ide.java
@@ -1,7 +1,23 @@
 package io.quarkus.deployment.ide;
 
 public enum Ide {
-    IDEA,
-    ECLIPSE,
-    VSCODE
+
+    IDEA("idea"),
+    ECLIPSE("eclipse"),
+    VSCODE("code"),
+    NETBEANS("netbeans");
+
+    private String executable;
+
+    private Ide(String executable) {
+        this.executable = executable;
+    }
+
+    public String getExecutable() {
+        return executable;
+    }
+
+    public void setExecutable(String executable) {
+        this.executable = executable;
+    }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeConfig.java
@@ -17,6 +17,7 @@ enum Target {
         auto,
         idea,
         vscode,
-        eclipse
+        eclipse,
+        netbeans
     }
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/ide/IdeProcessor.java
@@ -13,6 +13,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
@@ -24,15 +25,37 @@ public class IdeProcessor {
 
     private static Map<String, List<Ide>> IDE_MARKER_FILES = new HashMap<>();
     private static Map<Predicate<ProcessInfo>, Ide> IDE_PROCESSES = new HashMap<>();
+    private static Map<Ide, Function<ProcessInfo, String>> IDE_ARGUMENTS_EXEC_INDICATOR = new HashMap<>();
 
     static {
         IDE_MARKER_FILES.put(".idea", Collections.singletonList(Ide.IDEA));
         IDE_MARKER_FILES.put(".project", Arrays.asList(Ide.VSCODE, Ide.ECLIPSE));
+        IDE_MARKER_FILES.put("nbactions.xml", Collections.singletonList(Ide.NETBEANS));
+        IDE_MARKER_FILES.put("nb-configuration.xml", Collections.singletonList(Ide.NETBEANS));
+
         IDE_MARKER_FILES = Collections.unmodifiableMap(IDE_MARKER_FILES);
 
-        IDE_PROCESSES.put((processInfo -> processInfo.getCommand().contains("idea")), Ide.IDEA);
-        IDE_PROCESSES.put((processInfo -> processInfo.getCommand().contains("code")), Ide.VSCODE);
-        IDE_PROCESSES.put((processInfo -> processInfo.getCommand().contains("eclipse")), Ide.ECLIPSE); // TODO: I have no idea if this is correct
+        IDE_PROCESSES.put((processInfo -> processInfo.containInCommand("idea")), Ide.IDEA);
+        IDE_PROCESSES.put((processInfo -> processInfo.containInCommand("code")), Ide.VSCODE);
+        IDE_PROCESSES.put((processInfo -> processInfo.containInCommand("eclipse")), Ide.ECLIPSE);
+        IDE_PROCESSES.put(
+                (processInfo -> processInfo.containInCommandWithArgument("java", "netbeans")),
+                Ide.NETBEANS);
+
+        IDE_ARGUMENTS_EXEC_INDICATOR.put(Ide.NETBEANS, (ProcessInfo processInfo) -> {
+            String platform = processInfo.getArgumentValue("-Dnetbeans.home");
+            if (platform != null && !platform.isEmpty()) {
+                String os = System.getProperty("os.name");
+                if (os.startsWith("Windows") || os.startsWith("windows")) {
+                    platform = platform.replace("platform", "bin/netbeans.exe");
+                } else {
+                    platform = platform.replace("platform", "bin/netbeans");
+                }
+                return platform;
+            }
+            return null;
+        });
+
         IDE_PROCESSES = Collections.unmodifiableMap(IDE_PROCESSES);
     }
 
@@ -72,6 +95,8 @@ public EffectiveIdeBuildItem effectiveIde(IdeConfig ideConfig, IdeFileBuildItem
                 result = Ide.ECLIPSE;
             } else if (ideConfig.target == IdeConfig.Target.vscode) {
                 result = Ide.VSCODE;
+            } else if (ideConfig.target == IdeConfig.Target.netbeans) {
+                result = Ide.NETBEANS;
             }
         }
 
@@ -96,12 +121,21 @@ public IdeFileBuildItem detectIdeFiles(BuildSystemTargetBuildItem buildSystemTar
 
     @BuildStep
     public IdeRunningProcessBuildItem detectRunningIdeProcesses() {
-        Set<Ide> result = new HashSet<>(2);
+        Set<Ide> result = new HashSet<>(4);
         List<ProcessInfo> processInfos = ProcessUtil.runningProcesses();
         for (ProcessInfo processInfo : processInfos) {
             for (Map.Entry<Predicate<ProcessInfo>, Ide> entry : IDE_PROCESSES.entrySet()) {
                 if (entry.getKey().test(processInfo)) {
-                    result.add(entry.getValue());
+                    Ide ide = entry.getValue();
+
+                    if (IDE_ARGUMENTS_EXEC_INDICATOR.containsKey(ide)) {
+                        Function<ProcessInfo, String> execIndicator = IDE_ARGUMENTS_EXEC_INDICATOR.get(ide);
+                        String executeLine = execIndicator.apply(processInfo);
+                        if (executeLine != null) {
+                            ide.setExecutable(executeLine);
+                        }
+                    }
+                    result.add(ide);
                     break;
                 }
             }
@@ -128,14 +162,17 @@ public static List<ProcessInfo> runningProcesses() {
                 Method processHandleInfoMethod = processHandlerClass.getMethod("info");
                 Class processHandleInfoClass = Class.forName("java.lang.ProcessHandle$Info");
                 Method processHandleInfoCommandMethod = processHandleInfoClass.getMethod("command");
+                Method processHandleInfoArgumentsMethod = processHandleInfoClass.getMethod("arguments");
                 Stream<Object> allProcessesResult = (Stream<Object>) allProcessesMethod.invoke(null);
                 List<ProcessInfo> result = new ArrayList<>();
                 allProcessesResult.forEach(o -> {
                     try {
                         Object processHandleInfo = processHandleInfoMethod.invoke(o);
                         Optional<String> command = (Optional<String>) processHandleInfoCommandMethod.invoke(processHandleInfo);
                         if (command.isPresent()) {
-                            result.add(new ProcessInfo(command.get()));
+                            Optional<String[]> arguments = (Optional<String[]>) processHandleInfoArgumentsMethod
+                                    .invoke(processHandleInfo);
+                            result.add(new ProcessInfo(command.get(), arguments.orElse(null)));
                         }
                     } catch (IllegalAccessException | InvocationTargetException e) {
                         throw new RuntimeException(e);
@@ -151,13 +188,49 @@ public static List<ProcessInfo> runningProcesses() {
     private static class ProcessInfo {
         // the executable pathname of the process.
         private final String command;
+        private final String[] arguments;
 
-        public ProcessInfo(String command) {
+        public ProcessInfo(String command, String[] arguments) {
             this.command = command;
+            this.arguments = arguments;
         }
 
         public String getCommand() {
             return command;
         }
+
+        public String[] getArguments() {
+            return arguments;
+        }
+
+        public boolean containInCommandWithArgument(String command, String argument) {
+            return containInCommand(command) && containInArguments(argument);
+        }
+
+        public boolean containInCommand(String value) {
+            return this.command.contains(value);
+        }
+
+        public boolean containInArguments(String value) {
+            if (arguments != null) {
+                for (String argument : arguments) {
+                    if (argument.contains(value)) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        public String getArgumentValue(String argumentKey) {
+            if (arguments != null) {
+                for (String argument : arguments) {
+                    if (argument.startsWith(argumentKey) && argument.contains("=")) {
+                        return argument.substring(argument.indexOf("=") + 1);
+                    }
+                }
+            }
+            return null;
+        }
     }
 }
diff --git a/...oyment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/OpenIdeHandler.java b/...oyment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/OpenIdeHandler.java
@@ -44,10 +44,8 @@ protected void dispatch(RoutingContext routingContext, MultiMap form) {
             routingContext.fail(400);
         }
 
-        if (ide == Ide.IDEA) {
-            typicalProcessLaunch(routingContext, className, lang, srcMainPath, line, "idea");
-        } else if (ide == Ide.ECLIPSE) {
-            typicalProcessLaunch(routingContext, className, lang, srcMainPath, line, "eclipse");
+        if (ide != null) {
+            typicalProcessLaunch(routingContext, className, lang, srcMainPath, line, ide.getExecutable());
         } else {
             log.debug("Unhandled IDE : " + ide);
             routingContext.fail(500);
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ enum Target { @@
             auto,
             idea,
             vscode,
-            eclipse
+            eclipse,
+            netbeans
         }
     }