danog/dart-sass
1
0
Fork 0
mirror of https://github.com/danog/dart-sass.git synced 2024-12-02 09:37:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Properly remove quotes when stringifying.

Browse Source
This commit is contained in:
Natalie Weizenbaum 2016-10-16 19:13:13 -07:00
parent 7f6c70f821
commit beb5cc1794
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/src/value.dart
View File

@ -286,7 +286,9 @@ abstract class Value {
/// Throws a [SassScriptException] if [this] can't be represented in plain /// Throws a [SassScriptException] if [this] can't be represented in plain
/// CSS. Use [toString] instead to get a string representation even if this /// CSS. Use [toString] instead to get a string representation even if this
/// isn't valid CSS. /// isn't valid CSS.
String toCssString() => valueToCss(this); ///
/// If [quote] is `false`, quoted strings are emitted without quotes.
String toCssString({bool quote: true}) => valueToCss(this, quote: quote);
/// Returns a string representation of [this]. /// Returns a string representation of [this].
/// ///

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

@ -596,7 +596,7 @@ class _PerformVisitor implements StatementVisitor, ExpressionVisitor<Value> {
} else if (condition is SupportsNegation) { } else if (condition is SupportsNegation) {
return "not ${_parenthesize(condition.condition)}"; return "not ${_parenthesize(condition.condition)}";
} else if (condition is SupportsInterpolation) { } else if (condition is SupportsInterpolation) {
return condition.expression.accept(this).toCssString(); return condition.expression.accept(this).toCssString(quote: false);
} else if (condition is SupportsDeclaration) { } else if (condition is SupportsDeclaration) {
return "(${condition.name.accept(this).toCssString()}: " return "(${condition.name.accept(this).toCssString()}: "
"${condition.value.accept(this).toCssString()})"; "${condition.value.accept(this).toCssString()})";
@ -627,10 +627,12 @@ class _PerformVisitor implements StatementVisitor, ExpressionVisitor<Value> {
} }
void visitWarnRule(WarnRule node) { void visitWarnRule(WarnRule node) {
_addExceptionSpan( _addExceptionSpan(node.span, () {
node.span, var value = node.expression.accept(this);
() => stderr var string = value is SassString ? value.text : value.toCssString();
.writeln("WARNING: ${node.expression.accept(this).toCssString()}")); stderr.writeln("WARNING: $string");
});
for (var line in _stackTrace(node.span).toString().split("\n")) { for (var line in _stackTrace(node.span).toString().split("\n")) {
stderr.writeln(" $line"); stderr.writeln(" $line");
} }
@ -1120,7 +1122,7 @@ class _PerformVisitor implements StatementVisitor, ExpressionVisitor<Value> {
return interpolation.contents.map((value) { return interpolation.contents.map((value) {
if (value is String) return value; if (value is String) return value;
var result = (value as Expression).accept(this); var result = (value as Expression).accept(this);
return result is SassString ? result.text : result; return result.toCssString(quote: false);
}).join(); }).join();
} }

18
lib/src/visitor/serialize.dart
View File

@ -46,8 +46,10 @@ String toCss(CssNode node, {OutputStyle style, bool inspect: false}) {
/// source structure. Note however that, although this will be valid SCSS, it /// source structure. Note however that, although this will be valid SCSS, it
/// may not be valid CSS. If [inspect] is `false` and [value] can't be /// may not be valid CSS. If [inspect] is `false` and [value] can't be
/// represented in plain CSS, throws a [SassScriptException]. /// represented in plain CSS, throws a [SassScriptException].
String valueToCss(Value value, {bool inspect: false}) { ///
var visitor = new _SerializeCssVisitor(inspect: inspect); /// If [quote] is `false`, quoted strings are emitted without quotes.
String valueToCss(Value value, {bool inspect: false, bool quote: true}) {
var visitor = new _SerializeCssVisitor(inspect: inspect, quote: quote);
value.accept(visitor); value.accept(visitor);
return visitor._buffer.toString(); return visitor._buffer.toString();
} }
@ -77,8 +79,13 @@ class _SerializeCssVisitor
/// structure, as opposed to valid CSS. /// structure, as opposed to valid CSS.
final bool _inspect; final bool _inspect;
_SerializeCssVisitor({OutputStyle style, bool inspect: false}) /// Whether quoted strings should be emitted with quotes.
: _inspect = inspect; final bool _quote;
_SerializeCssVisitor(
{OutputStyle style, bool inspect: false, bool quote: true})
: _inspect = inspect,
_quote = quote;
void visitStylesheet(CssStylesheet node) { void visitStylesheet(CssStylesheet node) {
for (var child in node.children) { for (var child in node.children) {
@ -468,9 +475,10 @@ class _SerializeCssVisitor
} }
void visitString(SassString string) { void visitString(SassString string) {
if (string.hasQuotes) { if (_quote && string.hasQuotes) {
_visitString(string.text); _visitString(string.text);
} else { } else {
// TODO: write this character-by-character.
_buffer.write(string.text.replaceAll("\n", " ")); _buffer.write(string.text.replaceAll("\n", " "));
} }
} }