Skip to content
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

Jump to bottom

Improve error reporting when reading the config. #185

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve error reporting when reading the config. #185

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 42 additions & 2 deletions OmniSharp/Configuration/PathReplacement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,23 @@ public static OmniSharpConfiguration Load()
return Load(configLocation: "", clientMode: null);
}

private static void offsetToLineColumn(string message, int offset, out int lineNumber, out int column, out string lineContent)
{
string[] lines = message.Replace("\r\n", "\n").Replace("\n\r", "\n").Split('\n');
int accumulatedLength = 0;

lineNumber = 0;

while (accumulatedLength + lines[lineNumber].Length < offset)
{
accumulatedLength += lines[lineNumber].Length;
lineNumber++;
}

column = (offset - accumulatedLength);
lineContent = lines[lineNumber];
}

public static OmniSharpConfiguration Load(string configLocation, string clientMode)
{
if (string.IsNullOrEmpty(configLocation))
Expand All @@ -21,8 +38,31 @@ public static OmniSharpConfiguration Load(string configLocation, string clientMo
configLocation = Path.Combine(executableLocation, "config.json");
}
var config = StripComments(File.ReadAllText(configLocation));
_config = new Nancy.Json.JavaScriptSerializer().Deserialize<OmniSharpConfiguration>(config);
_config.ConfigFileLocation = configLocation;
try
{
_config = new Nancy.Json.JavaScriptSerializer().Deserialize<OmniSharpConfiguration>(config);
_config.ConfigFileLocation = configLocation;
}
catch (System.ArgumentException e)
{
Console.WriteLine(e.Message);
const string pattern = @"\(([0-9]+)\)$";
int offset;
if (int.TryParse(Regex.Match(e.Message, pattern).Groups[1].Value, out offset))
{
int lineNumber, columnNumber;
string lineContent;

offsetToLineColumn(e.Message, offset, out lineNumber, out columnNumber, out lineContent);
Console.WriteLine(configLocation + "(" + lineNumber + "," + columnNumber + "):" + lineContent);
}
// The system cannot work because of a User
// error. Therefore we Exit(). If we would throw
// the error again, we would trigger a stacktrace.
// That would lead the user to think this is a
// programming error.
Environment.Exit(1);
}

if (!string.IsNullOrWhiteSpace(clientMode))
{
Expand Down