[ShaderGraph] [Ruby] [2022.1] Fix "view shader" commands to not block…

… Unity from closing, use same editor instance (#5735) * Use OpenFileAtLineExternal instead of directly invoking script editor process... * Adding changelog * Update call to go through CodeEditors Co-authored-by: Jesse Barker <jesseb@unity3d.com>
Unity-Technologies · Sep 21, 2021 · fbe3aa2 · fbe3aa2
1 parent 44259f5
commit fbe3aa2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/com.unity.shadergraph/CHANGELOG.md b/com.unity.shadergraph/CHANGELOG.md
@@ -21,6 +21,7 @@ The version number for this package has increased due to a version update of a r
  - Fixed the appearance (wrong text color, and not wrapped) of a warning in Node Settings [1356725] (https://issuetracker.unity3d.com/product/unity/issues/guid/1356725/)
  - Fixed the ordering of inputs on a SubGraph node to match the properties on the blackboard of the subgraph itself [1354463]
  - Added more inputs to the Parallax Occlusion Mapping node to handle non-uniformly scaled UVs such as HDRP/Lit POM [1347008].
+ - Fixed an issue where ShaderGraph "view shader" commands were opening in individual windows, and blocking Unity from closing [1367188]
 
 ## [12.0.0] - 2021-01-11
 

diff --git a/com.unity.shadergraph/Editor/Data/Util/GraphUtil.cs b/com.unity.shadergraph/Editor/Data/Util/GraphUtil.cs
@@ -362,26 +362,6 @@ public static bool WriteToFile(string path, string content)
             }
         }
 
-        static ProcessStartInfo CreateProcessStartInfo(string filePath)
-        {
-            string externalScriptEditor = ScriptEditorUtility.GetExternalScriptEditor();
-
-            ProcessStartInfo psi = new ProcessStartInfo();
-            psi.UseShellExecute = false;
-
-
-#if UNITY_EDITOR_OSX
-            string arg = string.Format("-a \"{0}\" -n --args \"{1}\"", externalScriptEditor, Path.GetFullPath(filePath));
-            psi.FileName = "open";
-            psi.Arguments = arg;
-#else
-            psi.Arguments = Path.GetFileName(filePath);
-            psi.WorkingDirectory = Path.GetDirectoryName(filePath);
-            psi.FileName = externalScriptEditor;
-#endif
-            return psi;
-        }
-
         public static void OpenFile(string path)
         {
             string filePath = Path.GetFullPath(path);
@@ -394,8 +374,7 @@ public static void OpenFile(string path)
             string externalScriptEditor = ScriptEditorUtility.GetExternalScriptEditor();
             if (externalScriptEditor != "internal")
             {
-                ProcessStartInfo psi = CreateProcessStartInfo(filePath);
-                Process.Start(psi);
+                InternalEditorUtility.OpenFileAtLineExternal(filePath, 0);
             }
             else
             {