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

Preserve escapes in non-script identifiers. (#74)

Browse Source
This commit is contained in:
Natalie Weizenbaum 2016-12-18 22:42:11 -08:00 committed by GitHub
parent 9fdc8194fd
commit e5fb64e89f
3 changed files with 46 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -16,6 +16,9 @@
* Don't crash when passing only `$hue` or no keyword arguments to
`adjust-color()`, `scale-color()`, or `change-color()`.
* Preserve escapes in identifiers. This used to only work for identifiers in
SassScript.
## 1.0.0-alpha.5
* Fix bounds-checking for `opacify()`, `fade-in()`, `transparentize()`, and

72
lib/src/parse/parser.dart
View File

@ -98,7 +98,7 @@ abstract class Parser {
} else if (isNameStart(first)) {
text.writeCharCode(scanner.readChar());
} else if (first == $backslash) {
text.writeCharCode(escape());
text.write(escape());
} else {
scanner.error("Expected identifier.");
}
@ -115,7 +115,7 @@ abstract class Parser {
} else if (isName(next)) {
text.writeCharCode(scanner.readChar());
} else if (next == $backslash) {
text.writeCharCode(escape());
text.write(escape());
} else {
break;
}
@ -151,7 +151,7 @@ abstract class Parser {
scanner.readChar();
scanner.readChar();
} else {
buffer.writeCharCode(escape());
buffer.writeCharCode(escapeCharacter());
}
} else {
buffer.writeCharCode(scanner.readChar());
@ -176,7 +176,7 @@ abstract class Parser {
var next = scanner.peekChar();
switch (next) {
case $backslash:
buffer.writeCharCode(escape());
buffer.write(escape());
wroteNewline = false;
break;
@ -289,7 +289,7 @@ abstract class Parser {
next >= 0x0080) {
buffer.writeCharCode(scanner.readChar());
} else if (next == $backslash) {
buffer.writeCharCode(escape());
buffer.write(escape());
} else if (isWhitespace(next)) {
whitespace();
if (scanner.peekChar() != $rparen) break;
@ -314,8 +314,38 @@ abstract class Parser {
// ## Characters
/// Consumes an escape sequence and returns the text that defines it.
String escape() {
// See https://drafts.csswg.org/css-syntax-3/#consume-escaped-code-point.
var buffer = new StringBuffer();
scanner.expectChar($backslash);
buffer.writeCharCode($backslash);
var first = scanner.peekChar();
if (first == null) {
// Do nothing.
} else if (isNewline(first)) {
scanner.error("Expected escape sequence.");
return null;
} else if (isHex(first)) {
for (var i = 0; i < 6; i++) {
var next = scanner.peekChar();
if (next == null || !isHex(next)) break;
buffer.writeCharCode(scanner.readChar());
}
if (isWhitespace(scanner.peekChar())) {
buffer.writeCharCode(scanner.readChar());
}
} else {
buffer.writeCharCode(scanner.readChar());
}
return buffer.toString();
}
/// Consumes an escape sequence and returns the character it represents.
int escape() {
int escapeCharacter() {
// See https://drafts.csswg.org/css-syntax-3/#consume-escaped-code-point.
scanner.expectChar($backslash);
@ -346,32 +376,6 @@ abstract class Parser {
}
}
/// Consumes and returns the next character.
///
/// If the next character starts an escape sequence, parses the escape
/// sequence and returns the character it represents instead.
int readCharOrEscape() {
var next = scanner.readChar();
return next == $backslash ? escape() : next;
}
/// Consumes the next character or escape sequence, and returns whether it
/// equals [expected].
///
/// If [ignoreCase] is `true`, this ignores ASCII case when comparing the
/// scanner character to [expected].
///
/// Note that this conusmes the next character whether or not it matches
/// [expected].
bool _scanCharOrEscape(int expected, {bool ignoreCase: false}) {
// TODO(nweiz): Test if it's faster to split this into separate methods for
// case-sensitivity rather than checking the boolean each time.
var actual = readCharOrEscape();
return ignoreCase
? characterEqualsIgnoreCase(actual, expected)
: actual == expected;
}
// Consumes the next character if it matches [condition].
//
// Returns whether or not the character was consumed.
@ -463,7 +467,7 @@ abstract class Parser {
var start = scanner.state;
for (var i = 0; i < text.length; i++) {
var next = text.codeUnitAt(i);
if (_scanCharOrEscape(next, ignoreCase: ignoreCase)) continue;
if (scanCharIgnoreCase(next)) continue;
scanner.state = start;
return false;
}
@ -482,7 +486,7 @@ abstract class Parser {
var start = scanner.position;
for (var i = 0; i < text.length; i++) {
var next = text.codeUnitAt(i);
if (_scanCharOrEscape(next, ignoreCase: ignoreCase)) continue;
if (scanCharIgnoreCase(next)) continue;
scanner.error("Expected $name.", position: start);
}

35
lib/src/parse/stylesheet.dart
View File

@ -1797,7 +1797,7 @@ abstract class StylesheetParser extends Parser {
scanner.readChar();
scanner.readChar();
} else {
buffer.writeCharCode(escape());
buffer.writeCharCode(escapeCharacter());
}
} else if (next == $hash) {
if (scanner.peekChar(1) == $lbrace) {
@ -1934,7 +1934,7 @@ abstract class StylesheetParser extends Parser {
next >= 0x0080) {
buffer.writeCharCode(scanner.readChar());
} else if (next == $backslash) {
buffer.writeCharCode(escape());
buffer.write(escape());
} else if (next == $hash) {
if (scanner.peekChar(1) == $lbrace) {
buffer.add(singleInterpolation());
@ -2084,7 +2084,7 @@ abstract class StylesheetParser extends Parser {
var next = scanner.peekChar();
switch (next) {
case $backslash:
buffer.writeCharCode(escape());
buffer.write(escape());
wroteNewline = false;
break;
@ -2203,7 +2203,7 @@ abstract class StylesheetParser extends Parser {
} else if (isNameStart(first)) {
buffer.writeCharCode(scanner.readChar());
} else if (first == $backslash) {
_scanEscapeText(buffer);
buffer.write(escape());
} else if (first == $hash && scanner.peekChar(1) == $lbrace) {
buffer.add(singleInterpolation());
}
@ -2218,7 +2218,7 @@ abstract class StylesheetParser extends Parser {
next >= 0x0080) {
buffer.writeCharCode(scanner.readChar());
} else if (next == $backslash) {
_scanEscapeText(buffer);
buffer.write(escape());
} else if (next == $hash && scanner.peekChar(1) == $lbrace) {
buffer.add(singleInterpolation());
} else {
@ -2229,31 +2229,6 @@ abstract class StylesheetParser extends Parser {
return buffer.interpolation(scanner.spanFrom(start));
}
/// Consumes an escape sequence and writes the characters that compose it to
/// [buffer].
void _scanEscapeText(StringSink buffer) {
scanner.expectChar($backslash);
buffer.writeCharCode($backslash);
var first = scanner.peekChar();
if (first == null) {
return;
} else if (isNewline(first)) {
scanner.error("Expected escape sequence.");
} else if (isHex(first)) {
for (var i = 0; i < 6; i++) {
var next = scanner.peekChar();
if (next == null || !isHex(next)) break;
buffer.writeCharCode(scanner.readChar());
}
if (isWhitespace(scanner.peekChar())) {
buffer.writeCharCode(scanner.readChar());
}
} else {
buffer.writeCharCode(scanner.readChar());
}
}
/// Consumes interpolation.
Expression singleInterpolation() {
scanner.expect('#{');