foldcc/com.unity.ide.cursor
1
0
Fork 0
mirror of https://github.com/boxqkrtm/com.unity.ide.cursor.git synced 2026-05-15 23:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhance Cursor instance management

Browse Source 
Improve the handling of multiple Cursor instances by implementing better workspace detection and reuse of existing windows.
This commit is contained in:
Dalton
2025-03-20 18:40:05 +08:00
parent 2c0153a9ba
commit cac0c13658
2 changed files with 137 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Editor/VisualStudioCursorInstallation.cs
View File

@@ -12,6 +12,7 @@ using System.Text.RegularExpressions;
using UnityEngine;
using SimpleJSON;
using IOPath = System.IO.Path;
using Debug = UnityEngine.Debug;
namespace Microsoft.Unity.VisualStudio.Editor {
internal class VisualStudioCursorInstallation : VisualStudioInstallation {
@@ -448,6 +449,36 @@ namespace Microsoft.Unity.VisualStudio.Editor {
}
}
private Process FindRunningCursorWithSolution(string solutionPath) {
var directory = IOPath.GetDirectoryName(solutionPath);
var processes = Process.GetProcessesByName("cursor");
var normalizedTargetPath = directory.Replace('\\', '/').TrimEnd('/').ToLowerInvariant();
foreach (var process in processes) {
try {
var workspaces = ProcessRunner.GetProcessWorkspaces(process);
if (workspaces != null && workspaces.Length > 0) {
foreach (var workspace in workspaces) {
var normalizedWorkspaceDir = workspace.Replace('\\', '/').TrimEnd('/').ToLowerInvariant();
if (string.Equals(normalizedWorkspaceDir, normalizedTargetPath, StringComparison.OrdinalIgnoreCase) ||
normalizedTargetPath.StartsWith(normalizedWorkspaceDir + "/", StringComparison.OrdinalIgnoreCase) ||
normalizedWorkspaceDir.StartsWith(normalizedTargetPath + "/", StringComparison.OrdinalIgnoreCase))
{
return process;
}
}
}
}
catch (Exception ex) {
Debug.LogError($"[Cursor] Error checking process: {ex}");
continue;
}
}
return null;
}
public override bool Open(string path, int line, int column, string solution) {
line = Math.Max(1, line);
column = Math.Max(0, column);
@@ -455,10 +486,26 @@ namespace Microsoft.Unity.VisualStudio.Editor {
var directory = IOPath.GetDirectoryName(solution);
var application = Path;
ProcessRunner.Start(string.IsNullOrEmpty(path) ?
ProcessStartInfoFor(application, $"\"{directory}\"") :
ProcessStartInfoFor(application, $"\"{directory}\" -g \"{path}\":{line}:{column}"));
var existingProcess = FindRunningCursorWithSolution(directory);
if (existingProcess != null) {
try {
var args = string.IsNullOrEmpty(path) ?
$"--reuse-window \"{directory}\"" :
$"--reuse-window -g \"{path}\":{line}:{column}";
ProcessRunner.Start(ProcessStartInfoFor(application, args));
return true;
}
catch (Exception ex) {
Debug.LogError($"[Cursor] Error using existing instance: {ex}");
}
}
var newArgs = string.IsNullOrEmpty(path) ?
$"--new-window \"{directory}\"" :
$"--new-window -g \"{path}\":{line}:{column}";
ProcessRunner.Start(ProcessStartInfoFor(application, newArgs));
return true;
}