Skip to content

Detect install location and allow ripgrep from PATH #1

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
idbrii wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Detect install location and allow ripgrep from PATH #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa68ee6
Don't assume install directory
idbrii Dec 29, 2020
329d0a6
Allow rg to be in the PATH
idbrii Dec 29, 2020
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
37 changes: 33 additions & 4 deletions FindReferencesInProject2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Runtime.CompilerServices;
using System.Threading;
using UnityEditor;
using UnityEngine;
Expand All @@ -11,9 +12,18 @@ public static class FindReferencesInProject2
private const string MenuItemName = "Assets/Find References In Project %#&f";
private const string MetaExtension = ".meta";

private static string InstallDirectory = "Assets/Editor/FindReferencesInProject2";

private static void UpdateInstallDirectory([CallerFilePath] string executingFilePath = "")
{
InstallDirectory = Path.GetDirectoryName(executingFilePath);
}

[MenuItem(MenuItemName, false, 25)]
public static void Find()
{
UpdateInstallDirectory();

bool isMacOS = Application.platform == RuntimePlatform.OSXEditor;
int totalWaitMilliseconds = isMacOS ? 2 * 1000 : 300 * 1000;
int cpuCount = Environment.ProcessorCount;
Expand All @@ -40,11 +50,18 @@ public static void Find()
}
else
{
psi.FileName = Path.Combine(Environment.CurrentDirectory, @"Tools\FindReferencesInProject2\rg.exe");
var ignore_file = Path.Combine(InstallDirectory, "ignore.txt");
var filepath = Path.Combine(Environment.CurrentDirectory, @"Tools\FindReferencesInProject2\rg.exe");
if (!File.Exists(filepath))
{
// Assume it's in our path.
filepath = "rg.exe";
}
psi.FileName = filepath;
psi.Arguments = string.Format("--case-sensitive --follow --files-with-matches --no-text --fixed-strings " +
"--ignore-file Assets/Editor/FindReferencesInProject2/ignore.txt " +
"--ignore-file {3} " +
"--threads {0} --regexp {1} -- {2}",
cpuCount, selectedAssetGUID, appDataPath);
cpuCount, selectedAssetGUID, appDataPath, ignore_file);
}

psi.UseShellExecute = false;
Expand Down Expand Up @@ -76,7 +93,19 @@ public static void Find()
output.AppendLine("Error: " + e.Data);
};

process.Start();
try
{
process.Start();
}
catch (SystemException)
{
if (!isMacOS)
{
var destination = Path.Combine(Environment.CurrentDirectory, @"Tools\FindReferencesInProject2");
UnityEngine.Debug.LogError($"Couldn't find ripgrep. Download ripgrep from https://github.com/BurntSushi/ripgrep/releases/latest and extract rg.exe to {destination} or add it to your PATH.");
}
throw;
}
process.BeginOutputReadLine();
process.BeginErrorReadLine();

Expand Down