@@ -49,7 +49,7 @@ public static SyntaxToken DeepestTokenContainingPosition(this SyntaxNode parent,
49
49
50
50
public static SyntaxToken DeepestTokenContainingSpan ( this SyntaxNode parent , TextSpan span )
51
51
{
52
- if ( ! parent . FullSpan . Contains ( span ) )
52
+ if ( ! parent . FullSpan . ContainsStrict ( span ) )
53
53
return default ;
54
54
55
55
var current = parent ;
@@ -71,7 +71,7 @@ public static SyntaxToken DeepestTokenContainingSpan(this SyntaxNode parent, Tex
71
71
72
72
public static SyntaxTrivia DeepestTriviaContainingSpan ( this SyntaxNode parent , TextSpan span )
73
73
{
74
- if ( ! parent . FullSpan . Contains ( span ) )
74
+ if ( ! parent . FullSpan . ContainsStrict ( span ) )
75
75
return default ;
76
76
77
77
var current = parent ;
@@ -155,18 +155,22 @@ private static SyntaxTrivia AtPosition(this SyntaxTriviaList list, int position)
155
155
}
156
156
}
157
157
158
+ public static bool ContainsStrict ( this TextSpan span , TextSpan other )
159
+ {
160
+ return span . Contains ( other . Start )
161
+ && span . Contains ( other . End )
162
+ ;
163
+ }
164
+
158
165
public static SyntaxNodeOrToken ChildThatContainsSpan ( this SyntaxNode node , TextSpan span )
159
166
{
160
167
var fullSpan = node . FullSpan ;
161
- if ( ! fullSpan . Contains ( span ) )
168
+ if ( ! fullSpan . ContainsStrict ( span ) )
162
169
return null ;
163
170
164
171
var start = span . Start ;
165
172
var end = span . End ;
166
173
167
- if ( ! fullSpan . Contains ( start ) )
168
- return null ;
169
-
170
174
var startingChild = node . ChildThatContainsPosition ( start ) ;
171
175
if ( startingChild == default )
172
176
return default ;
@@ -230,7 +234,7 @@ public static SyntaxNodeOrToken ChildThatContainsSpan(this SyntaxNode node, Text
230
234
public static SyntaxNode ? DeepestNodeContainingSpanIncludingStructuredTrivia (
231
235
this SyntaxNode parent , TextSpan span )
232
236
{
233
- if ( ! parent . FullSpan . Contains ( span ) )
237
+ if ( ! parent . FullSpan . ContainsStrict ( span ) )
234
238
return null ;
235
239
236
240
var current = parent ;
0 commit comments