Skip to content

Commit 1b7bfb0

Browse files
author
Kapil Borle
committed
Remove some redundancy from GetScriptExtentForFunctionName method
1 parent 88a77b9 commit 1b7bfb0

File tree

1 file changed

+9
-25
lines changed

1 file changed

+9
-25
lines changed

Engine/Helper.cs

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -657,44 +657,28 @@ public IScriptExtent GetScriptExtentForFunctionName(FunctionDefinitionAst functi
657657
{
658658
return null;
659659
}
660-
var funcNameToken = Tokens.Where(
661-
token => ContainsExtent(functionDefinitionAst.Extent, token.Extent)
660+
var funcNameTokens = Tokens.Where(
661+
token =>
662+
ContainsExtent(functionDefinitionAst.Extent, token.Extent)
662663
&& token.Text.Equals(functionDefinitionAst.Name));
663-
if (funcNameToken.Any())
664-
{
665-
return funcNameToken.First().Extent;
666-
}
667-
else
668-
{
669-
return null;
670-
}
664+
var funcNameToken = funcNameTokens.FirstOrDefault();
665+
return funcNameToken == null ? null : funcNameToken.Extent;
671666
}
672667

673668
/// <summary>
674-
/// Return true of subset is contained in set
669+
/// Return true if subset is contained in set
675670
/// </summary>
676671
/// <param name="set"></param>
677672
/// <param name="subset"></param>
678673
/// <returns>True or False</returns>
679674
private bool ContainsExtent(IScriptExtent set, IScriptExtent subset)
680675
{
681-
if (set == null)
682-
{
683-
throw new ArgumentNullException("set");
684-
}
685-
if (subset == null)
686-
{
687-
throw new ArgumentNullException("subset");
688-
}
689-
if (set.StartOffset <= subset.StartOffset
690-
&& set.EndOffset >= subset.EndOffset)
691-
{
692-
return true;
693-
}
694-
else
676+
if (set == null || subset == null)
695677
{
696678
return false;
697679
}
680+
return set.StartOffset <= subset.StartOffset
681+
&& set.EndOffset >= subset.EndOffset;
698682
}
699683
private void FindClosingParenthesis(string keyword)
700684
{

0 commit comments

Comments
 (0)