Skip to content

Commit

Permalink
Fix offset calculation and NREs
Browse files Browse the repository at this point in the history
Offset calculation was hitting the same new line repeatedly as it didn't
set the new offset for one *after* the new line char.

Also empty extents pass null as `FileContext` so added some null checks.
  • Loading branch information
SeeminglyScience committed May 25, 2022
1 parent 4303879 commit ec01a45
Showing 1 changed file with 31 additions and 5 deletions.
36 changes: 31 additions & 5 deletions src/PowerShellEditorServices/Extensions/EditorFileRanges.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,23 @@ public class FileScriptPosition : IScriptPosition, IFilePosition

public static FileScriptPosition FromPosition(FileContext file, int lineNumber, int columnNumber)
{
if (file is null)
{
throw new ArgumentNullException(nameof(file));
}

int offset = 0;
int currLine = 1;
string fileText = file.Ast.Extent.Text;
while (offset < fileText.Length && currLine < lineNumber)
{
offset = fileText.IndexOf('\n', offset);
offset = fileText.IndexOf('\n', offset) + 1;
if (offset is 0)
{
// Line and column passed were not valid and the offset can not be determined.
return new FileScriptPosition(file, lineNumber, columnNumber, offset);
}

currLine++;
}

Expand All @@ -31,6 +42,11 @@ public static FileScriptPosition FromPosition(FileContext file, int lineNumber,

public static FileScriptPosition FromOffset(FileContext file, int offset)
{
if (file is null)
{
throw new ArgumentNullException(nameof(file));
}

int line = 1;
string fileText = file.Ast.Extent.Text;

Expand Down Expand Up @@ -59,7 +75,7 @@ public static FileScriptPosition FromOffset(FileContext file, int offset)
internal FileScriptPosition(FileContext file, int lineNumber, int columnNumber, int offset)
{
_file = file;
Line = file.GetTextLines()[lineNumber - 1];
Line = file?.GetTextLines()?[lineNumber - 1] ?? string.Empty;
ColumnNumber = columnNumber;
LineNumber = lineNumber;
Offset = offset;
Expand All @@ -79,7 +95,7 @@ internal FileScriptPosition(FileContext file, int lineNumber, int columnNumber,

int IFilePosition.Line => LineNumber;

public string GetFullScript() => _file.GetText();
public string GetFullScript() => _file?.GetText() ?? string.Empty;
}

public class FileScriptExtent : IScriptExtent, IFileRange
Expand All @@ -94,6 +110,11 @@ public static bool IsEmpty(FileScriptExtent extent)

public static FileScriptExtent FromOffsets(FileContext file, int startOffset, int endOffset)
{
if (file is null)
{
throw new ArgumentNullException(nameof(file));
}

return new FileScriptExtent(
file,
FileScriptPosition.FromOffset(file, startOffset),
Expand All @@ -102,6 +123,11 @@ public static FileScriptExtent FromOffsets(FileContext file, int startOffset, in

public static FileScriptExtent FromPositions(FileContext file, int startLine, int startColumn, int endLine, int endColumn)
{
if (file is null)
{
throw new ArgumentNullException(nameof(file));
}

return new FileScriptExtent(
file,
FileScriptPosition.FromPosition(file, startLine, startColumn),
Expand All @@ -127,7 +153,7 @@ public FileScriptExtent(FileContext file, FileScriptPosition start, FileScriptPo

public IScriptPosition EndScriptPosition => _end;

public string File => _file.Path;
public string File => _file?.Path ?? string.Empty;

public int StartColumnNumber => _start.ColumnNumber;

Expand All @@ -137,7 +163,7 @@ public FileScriptExtent(FileContext file, FileScriptPosition start, FileScriptPo

public IScriptPosition StartScriptPosition => _start;

public string Text => _file.GetText().Substring(_start.Offset, _end.Offset - _start.Offset);
public string Text => _file?.GetText()?.Substring(_start.Offset, _end.Offset - _start.Offset) ?? string.Empty;

IFilePosition IFileRange.Start => _start;

Expand Down

0 comments on commit ec01a45

Please sign in to comment.