Skip to content

Commit 1dca4a7

Browse files
author
Kapil Borle
committed
Use extension method to test line/column in extent
1 parent d89ea60 commit 1dca4a7

File tree

1 file changed

+1
-27
lines changed

1 file changed

+1
-27
lines changed

src/PowerShellEditorServices/Language/LanguageService.cs

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -595,35 +595,9 @@ private Ast FindSmallestStatementAst(ScriptFile scriptFile, int lineNumber, int
595595
{
596596
var asts = scriptFile.ScriptAst.FindAll(ast =>
597597
{
598-
if (!(ast is StatementAst))
599-
{
600-
return false;
601-
}
602-
603-
var scriptExtent = ast.Extent;
604-
if (scriptExtent.StartLineNumber > lineNumber || scriptExtent.EndLineNumber < lineNumber)
605-
{
606-
return false;
607-
}
608-
609-
if (scriptExtent.StartLineNumber == lineNumber)
610-
{
611-
return scriptExtent.StartColumnNumber <= columnNumber;
612-
}
613-
614-
if (scriptExtent.EndLineNumber == lineNumber)
615-
{
616-
return scriptExtent.EndColumnNumber >= columnNumber;
617-
}
618-
619-
return true;
598+
return ast is StatementAst && ast.Extent.Contains(lineNumber, columnNumber);
620599
}, true);
621600

622-
if (asts == null || !asts.Any())
623-
{
624-
return null;
625-
}
626-
627601
// Find ast with the smallest extent
628602
return asts.MinElement((astX, astY) => astX.Extent.ExtentWitdhComparer(astY.Extent));
629603
}

0 commit comments

Comments
 (0)