Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug in JS MultiSpan #1801

Merged
merged 2 commits into from Sep 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Expand Up @@ -5,6 +5,11 @@
* Add an optional `argumentName` parameter to `SassScriptException()` to make it
easier to throw exceptions associated with particular argument names.

### JS API

* Fix a bug in which certain warning spans would not have their properties
accessible by the JS API.

## 1.54.9

* Fix an incorrect span in certain `@media` query deprecation warnings.
Expand Down
18 changes: 11 additions & 7 deletions lib/src/node/source_span.dart
Expand Up @@ -4,6 +4,7 @@

import 'package:source_span/source_span.dart';

import '../util/multi_span.dart';
import '../util/nullable.dart';
import 'reflection.dart';
import 'utils.dart';
Expand All @@ -12,14 +13,17 @@ import 'utils.dart';
/// that they match the JS API.
void updateSourceSpanPrototype() {
var span = SourceFile.fromString('').span(0);
var multiSpan = MultiSpan(span, '', {});

getJSClass(span).defineGetters({
'start': (FileSpan span) => span.start,
'end': (FileSpan span) => span.end,
'url': (FileSpan span) => span.sourceUrl.andThen(dartToJSUrl),
'text': (FileSpan span) => span.text,
'context': (FileSpan span) => span.context,
});
for (var item in [span, multiSpan]) {
getJSClass(item).defineGetters({
'start': (FileSpan span) => span.start,
'end': (FileSpan span) => span.end,
'url': (FileSpan span) => span.sourceUrl.andThen(dartToJSUrl),
'text': (FileSpan span) => span.text,
'context': (FileSpan span) => span.context,
});
}

// Offset is already accessible from JS because it's defined as a field rather
// than a getter.
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
@@ -1,5 +1,5 @@
name: sass
version: 1.55.0
version: 1.55.0-dev
description: A Sass implementation in Dart.
homepage: https://github.com/sass/dart-sass

Expand Down