OLD | NEW |
---|---|
1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 library source_span.span_with_context; | 5 library source_span.span_with_context; |
6 | 6 |
7 import 'location.dart'; | 7 import 'location.dart'; |
8 import 'span.dart'; | 8 import 'span.dart'; |
9 | 9 |
10 /// A class that describes a segment of source text with additional context. | 10 /// A class that describes a segment of source text with additional context. |
(...skipping 11 matching lines...) Expand all Loading... | |
22 /// [context]. | 22 /// [context]. |
23 SourceSpanWithContext( | 23 SourceSpanWithContext( |
24 SourceLocation start, SourceLocation end, String text, this.context) | 24 SourceLocation start, SourceLocation end, String text, this.context) |
25 : super(start, end, text) { | 25 : super(start, end, text) { |
26 var index = context.indexOf(text); | 26 var index = context.indexOf(text); |
27 if (index == -1) { | 27 if (index == -1) { |
28 throw new ArgumentError( | 28 throw new ArgumentError( |
29 'The context line "$context" must contain "$text".'); | 29 'The context line "$context" must contain "$text".'); |
30 } | 30 } |
31 | 31 |
32 var beginningOfLine = context.lastIndexOf('\n', index) + 1; | 32 // Note: `text` can appear in multiple places within context, but we don't |
33 if (start.column != index - beginningOfLine) { | 33 // know which occurrance of `text` is the one in the right location. |
34 throw new ArgumentError('The span text "$text" must start at ' | 34 while (index != -1) { |
35 'column ${start.column + 1} in a line within "$context".'); | 35 var beginningOfLine = context.lastIndexOf('\n', index) + 1; |
36 | |
37 // if the column matches, we are all set with validation. | |
38 if (start.column == index - beginningOfLine) return; | |
39 | |
40 index = context.indexOf(text, index + 1); | |
36 } | 41 } |
nweiz
2015/03/30 23:45:51
Shouldn't you also do this logic when constructing
Siggi Cherem (dart-lang)
2015/03/31 01:07:49
good point - fixed too.
| |
42 | |
43 // No match was found, means that all occurrences of `text` were not in the | |
44 // right place. | |
45 throw new ArgumentError('The span text "$text" must start at ' | |
46 'column ${start.column + 1} in a line within "$context".'); | |
37 } | 47 } |
38 } | 48 } |
OLD | NEW |