@@ -27,13 +27,14 @@ class RelativeSpanScanner extends StringScanner implements SpanScanner {
2727 /// This is used to convert between span-relative and file-relative fields.
2828 final FileLocation _startLocation;
2929
30- int get line => _sourceFile.getLine (_startLocation.offset + position) -
30+ int get line =>
31+ _sourceFile.getLine (_startLocation.offset + position) -
3132 _startLocation.line;
3233
3334 int get column {
3435 var line = _sourceFile.getLine (_startLocation.offset + position);
35- var column = _sourceFile. getColumn (_startLocation.offset + position,
36- line: line);
36+ var column =
37+ _sourceFile. getColumn (_startLocation.offset + position, line: line);
3738 return line == _startLocation.line
3839 ? column - _startLocation.column
3940 : column;
@@ -66,8 +67,7 @@ class RelativeSpanScanner extends StringScanner implements SpanScanner {
6667
6768 FileSpan spanFrom (LineScannerState startState, [LineScannerState endState]) {
6869 var endPosition = endState == null ? position : endState.position;
69- return _sourceFile.span (
70- _startLocation.offset + startState.position,
70+ return _sourceFile.span (_startLocation.offset + startState.position,
7171 _startLocation.offset + endPosition);
7272 }
7373
@@ -77,8 +77,7 @@ class RelativeSpanScanner extends StringScanner implements SpanScanner {
7777 return false ;
7878 }
7979
80- _lastSpan = _sourceFile.span (
81- _startLocation.offset + position,
80+ _lastSpan = _sourceFile.span (_startLocation.offset + position,
8281 _startLocation.offset + lastMatch.end);
8382 return true ;
8483 }
@@ -92,8 +91,7 @@ class RelativeSpanScanner extends StringScanner implements SpanScanner {
9291 }
9392 if (length == null ) length = match == null ? 1 : match.end - match.start;
9493
95- var span = _sourceFile.span (
96- _startLocation.offset + position,
94+ var span = _sourceFile.span (_startLocation.offset + position,
9795 _startLocation.offset + position + length);
9896 throw new StringScannerException (message, span, string);
9997 }
0 commit comments