@@ -657,44 +657,28 @@ public IScriptExtent GetScriptExtentForFunctionName(FunctionDefinitionAst functi
657
657
{
658
658
return null ;
659
659
}
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 )
662
663
&& 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 ;
671
666
}
672
667
673
668
/// <summary>
674
- /// Return true of subset is contained in set
669
+ /// Return true if subset is contained in set
675
670
/// </summary>
676
671
/// <param name="set"></param>
677
672
/// <param name="subset"></param>
678
673
/// <returns>True or False</returns>
679
674
private bool ContainsExtent ( IScriptExtent set , IScriptExtent subset )
680
675
{
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 )
695
677
{
696
678
return false ;
697
679
}
680
+ return set . StartOffset <= subset . StartOffset
681
+ && set . EndOffset >= subset . EndOffset ;
698
682
}
699
683
private void FindClosingParenthesis ( string keyword )
700
684
{
0 commit comments