danog/dart-sass
1
0
Fork 0
mirror of https://github.com/danog/dart-sass.git synced 2025-01-22 05:41:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to the latest source_span. (#151)

Browse Source
This commit is contained in:
Natalie Weizenbaum 2017-06-05 12:35:30 -07:00 committed by GitHub
parent e032de83fb
commit ab48b7104d
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/io/node.dart
View File

@ -60,7 +60,7 @@ String readFile(String path) {
var contents = _readFile(path, 'utf8') as String; var contents = _readFile(path, 'utf8') as String;
if (!contents.contains("<EFBFBD>")) return contents; if (!contents.contains("<EFBFBD>")) return contents;
var sourceFile = new SourceFile(contents, url: p.toUri(path)); var sourceFile = new SourceFile.fromString(contents, url: p.toUri(path));
for (var i = 0; i < contents.length; i++) { for (var i = 0; i < contents.length; i++) {
if (contents.codeUnitAt(i) != 0xFFFD) continue; if (contents.codeUnitAt(i) != 0xFFFD) continue;
throw new SassException( throw new SassException(

2
lib/src/io/vm.dart
View File

@ -23,7 +23,7 @@ String readFile(String path) {
return UTF8.decode(bytes); return UTF8.decode(bytes);
} on FormatException { } on FormatException {
var decoded = UTF8.decode(bytes, allowMalformed: true); var decoded = UTF8.decode(bytes, allowMalformed: true);
var sourceFile = new SourceFile(decoded, url: p.toUri(path)); var sourceFile = new SourceFile.fromString(decoded, url: p.toUri(path));
// TODO(nweiz): Use [FormatException.offset] instead when // TODO(nweiz): Use [FormatException.offset] instead when
// dart-lang/sdk#28293 is fixed. // dart-lang/sdk#28293 is fixed.

5
lib/src/visitor/perform.dart
View File

@ -1643,8 +1643,9 @@ class _PerformVisitor
var syntheticFile = span.file var syntheticFile = span.file
.getText(0) .getText(0)
.replaceRange(span.start.offset, span.end.offset, errorText); .replaceRange(span.start.offset, span.end.offset, errorText);
var syntheticSpan = new SourceFile(syntheticFile, url: span.file.url) var syntheticSpan =
.span(span.start.offset + error.span.start.offset, new SourceFile.fromString(syntheticFile, url: span.file.url).span(
span.start.offset + error.span.start.offset,
span.start.offset + error.span.end.offset); span.start.offset + error.span.end.offset);
throw _exception(error.message, syntheticSpan); throw _exception(error.message, syntheticSpan);
} }

2
pubspec.yaml
View File

@ -15,7 +15,7 @@ dependencies:
charcode: "^1.1.0" charcode: "^1.1.0"
collection: "^1.8.0" collection: "^1.8.0"
path: "^1.0.0" path: "^1.0.0"
source_span: "^1.3.0" source_span: "^1.4.0"
string_scanner: ">=0.1.5 <2.0.0" string_scanner: ">=0.1.5 <2.0.0"
stack_trace: ">=0.9.0 <2.0.0" stack_trace: ">=0.9.0 <2.0.0"
tuple: "^1.0.0" tuple: "^1.0.0"