Merge pull request #8996 from matthiasblaesing/ideopen_windows

NetBeans terminal provides "ideopen" command to open a local path this fails on windows

Author: matthiasblaesing

ide/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/OpenInEditorActionProvider.java

@@ -18,7 +18,6 @@
  */
 package org.netbeans.modules.dlight.terminal.action;
 
-import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -28,13 +27,10 @@
 import org.netbeans.lib.terminalemulator.Term;
 import org.netbeans.modules.nativeexecution.api.ExecutionEnvironment;
 import org.netbeans.modules.nativeexecution.api.ExecutionEnvironmentFactory;
-import org.netbeans.modules.nativeexecution.api.util.HostInfoUtils;
+import org.netbeans.modules.nativeexecution.api.util.WindowsSupport;
 import org.netbeans.modules.terminal.spi.ui.ExternalCommandActionProvider;
 import org.netbeans.modules.terminal.support.OpenInEditorAction;
-import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileUtil;
-import org.openide.filesystems.URLMapper;
-import org.openide.util.Exceptions;
+import org.openide.util.BaseUtilities;
 import org.openide.util.Lookup;
 import org.openide.util.lookup.ServiceProvider;
 
@@ -83,12 +79,14 @@ public void handle(String command, Lookup lookup) {
 
             Object key = lookup.lookup(Term.class).getClientProperty(Term.ExternalCommandsConstants.EXECUTION_ENV_PROPERTY_KEY);
             URL url = null;
+            boolean remoteShell = false;
             try {
 
                 if (key instanceof String) {
                     ExecutionEnvironment env = ExecutionEnvironmentFactory.fromUniqueID((String) key);
                     if (env.isRemote()) {
                         url = new URL("rfs://" + key + filePath); //NOI18N
+                        remoteShell = true;
                     }
 
                 }
@@ -99,6 +97,12 @@ public void handle(String command, Lookup lookup) {
             if (url != null) {
                 OpenInEditorAction.post(url, lineNumber);
             } else {
+                if (!remoteShell && BaseUtilities.isWindows()) {
+                    // NetBeans only supports shells running via cygwin/msys
+                    // the paths then need to be converted to basic windows
+                    // paths
+                    filePath = WindowsSupport.getInstance().convertToWindowsPath(filePath);
+                }
                 OpenInEditorAction.post(filePath, lineNumber);
             }
         }

ide/terminal.nb/src/org/netbeans/modules/terminal/support/OpenInEditorAction.java

@@ -26,12 +26,12 @@
 import org.openide.cookies.EditorCookie;
 import org.openide.cookies.LineCookie;
 import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileUtil;
 import org.openide.filesystems.URLMapper;
 import org.openide.loaders.DataObject;
 import org.openide.text.Line;
 import org.openide.util.Exceptions;
 import org.openide.util.RequestProcessor;
+import org.openide.util.Utilities;
 
 /**
  *
@@ -52,7 +52,7 @@ public static void post(URL url, int lineNumber) {
 
     public static void post(String filePath, int lineNumber) {
         try {
-            RP.post(new OpenInEditorAction(new URL("file://" + filePath), lineNumber)); //NOI18N
+            RP.post(new OpenInEditorAction(Utilities.toURI(new File(filePath)).toURL(), lineNumber)); //NOI18N
         } catch (MalformedURLException ex) {
             Exceptions.printStackTrace(ex);
         }
@@ -84,12 +84,7 @@ private void doWork() {
             return;
         }
         try {
-            FileObject fo;
-            if (url.getProtocol().equals("file")) { //NOI18N
-                fo = FileUtil.toFileObject(new File(url.getPath()));
-            } else {
-                fo = URLMapper.findFileObject(url); //NOI18N
-            }
+            FileObject fo = URLMapper.findFileObject(url); //NOI18N
             DataObject dobj = DataObject.find(fo);
             EditorCookie ed = dobj.getLookup().lookup(EditorCookie.class);
             if (ed != null && fo == dobj.getPrimaryFile()) {