Skip to content

Added neovim location selector support in project preferences #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SolidSolar wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added neovim location selector support in project preferences #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e33f25
fix: fixed ihcorrect placed preprocessors for windows platform
SolidSolar Jun 8, 2025
17b3a5c
feat: added nvim.exe path selection to external editor preferences
SolidSolar Jun 8, 2025
b81f3cd
Merge branch 'master' of https://github.com/SolidSolar/nvim-unity
SolidSolar Jun 8, 2025
1998a60
fix: added preprocessors for neovimLocation field in Config to make s…
SolidSolar Jun 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Editor/Config.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ namespace NvimUnity
public class Config
{
public string last_project = "";
public void MergeMissingDefaults(Config defaults) { }
#if UNITY_EDITOR_WIN
public string neovimLocation = "C:\\Program Files\\Neovim\\bin\\nvim.exe";
#endif
public void MergeMissingDefaults(Config defaults) { }
}

public static class ConfigManager
Expand Down
36 changes: 30 additions & 6 deletions Editor/NeovimEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,26 +60,32 @@ public bool OpenProject(string path, int line, int column)
{
if (OS == "Windows")
{

#if UNITY_EDITOR_WIN
var psi = new ProcessStartInfo
{
FileName = defaultApp,
Arguments = $"{path} {line}",
Arguments = $"{path} {line} {config.neovimLocation}",
UseShellExecute = true,
CreateNoWindow = false,
};

if(debugging)
UnityEngine.Debug.Log($"[NvimUnity] Executing: {psi.FileName} {psi.Arguments}");
Process.Start(defaultApp, $"{path} {line}");
Process.Start(defaultApp, $"{path} {line} {config.neovimLocation}");
#endif
}
else
{
// Original behavior for other OSes

#if !UNITY_EDITOR_WIN
// Original behavior for other OSes
ProcessStartInfo psi = Utils.BuildProcessStartInfo(defaultApp, path, line);
if(debugging)
UnityEngine.Debug.Log($"[NvimUnity] Executing in terminal: {psi.FileName} {psi.Arguments}");
Process.Start(psi);
}
#endif
}
return true;
}
catch (Exception ex)
Expand All @@ -100,7 +106,13 @@ public bool OpenFile(string filePath, int line)
{
string cmd = $"<CMD>e +{line} {filePath}<CR>";
string nvimArgs = $"--server {Socket} --remote-send \"{cmd}\"";
string nvimPath = Utils.GetNeovimPath();
string nvimPath =

#if UNITY_EDITOR_WIN
config.neovimLocation;
#else
Utils.GetNeovimPath();
#endif

var psi = new ProcessStartInfo
{
Expand Down Expand Up @@ -134,7 +146,19 @@ public void OnGUI()
}

EditorGUILayout.EndHorizontal();


#if UNITY_EDITOR_WIN
EditorGUILayout.BeginHorizontal();

GUILayout.Label("Neovim location", EditorStyles.boldLabel, GUILayout.Width(250));
config.neovimLocation = GUILayout.TextField(config.neovimLocation);
if(GUILayout.Button("Browse", GUILayout.Width(80))){
config.neovimLocation = EditorUtility.OpenFilePanel("Select neovim", "", "exe");
ConfigManager.SaveConfig(config);
}
EditorGUILayout.EndHorizontal();
#endif
GUILayout.Space(10);
}

Expand Down Expand Up @@ -189,7 +213,7 @@ public bool TryGetInstallationForPath(string editorPath, out CodeEditor.Installa
return true;
}

public void Save()
public static void Save()
{
if (needSaveConfig)
{
Expand Down
11 changes: 5 additions & 6 deletions Editor/Utils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ public static void EnsureLauncherExecutable()
}
#endif
}
#if !UNITY_EDITOR_WIN

public static ProcessStartInfo BuildProcessStartInfo(string defaultApp, string path, int line)
{
#if !UNITY_EDITOR_WIN
string preferredTerminal = NeovimPreferences.GetPreferredTerminal();

string fileName = "/usr/bin/env";
Expand Down Expand Up @@ -183,13 +183,12 @@ public static ProcessStartInfo BuildProcessStartInfo(string defaultApp, string p
UseShellExecute = true,
CreateNoWindow = false
};
#endif
return null;
}
#endif
#if !UNITY_EDITOR_WIN

public static bool IsTerminalAvailable(string terminalName)
{
#if !UNITY_EDITOR_WIN
UnityEngine.Debug.Log($"[NvimUnity] Checking if terminal is available: {terminalName}");
try
{
Expand All @@ -213,9 +212,9 @@ public static bool IsTerminalAvailable(string terminalName)
{
return false;
}
#endif
return true;
}
#endif

}
}