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

Refactor comment statement parsing.

Browse Source
This commit is contained in:
Natalie Weizenbaum 2016-09-10 14:45:12 -07:00 committed by Natalie Weizenbaum
parent 3a2b7ca9df
commit aab7c741c7
2 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,6 @@ abstract class Parser {
// ## Tokens
String commentText() => rawText(ignoreComments);
bool scanWhitespace() {
var start = scanner.position;
ignoreComments();

70
lib/src/parse/scss.dart
View File

@ -155,15 +155,15 @@ class ScssParser extends Parser {
first == $dot ||
(first == $hash && scanner.peekChar(1) != $lbrace)) {
nameBuffer.writeCharCode(scanner.readChar());
nameBuffer.write(commentText());
nameBuffer.write(rawText(ignoreComments));
}
if (!_lookingAtInterpolatedIdentifier()) return nameBuffer;
nameBuffer.addInterpolation(_interpolatedIdentifier());
nameBuffer.write(rawText(_tryComment));
if (scanner.matches("/*")) nameBuffer.write(rawText(loudComment));
var midBuffer = new StringBuffer();
midBuffer.write(commentText());
midBuffer.write(rawText(ignoreComments));
if (!scanner.scanChar($colon)) return nameBuffer;
midBuffer.writeCharCode($colon);
@ -184,7 +184,7 @@ class ScssParser extends Parser {
..writeCharCode($colon);
}
var postColonWhitespace = commentText();
var postColonWhitespace = rawText(ignoreComments);
if (scanner.peekChar() == $lbrace) {
return new Declaration(name, scanner.spanFrom(start),
children: _children(_declarationChild));
@ -254,31 +254,6 @@ class ScssParser extends Parser {
return _declaration();
}
/// Consumes whitespace if available and returns any comments it contained.
List<Comment> _comments() {
var nodes = <Comment>[];
while (true) {
whitespace();
var comment = _tryComment();
if (comment == null) return nodes;
nodes.add(comment);
}
}
Comment _tryComment() {
if (scanner.peekChar() != $slash) return null;
switch (scanner.peekChar(1)) {
case $slash:
return _silentComment();
case $asterisk:
return _loudComment();
default:
return null;
}
}
Comment _silentComment() {
var start = scanner.state;
scanner.expect("//");
@ -1544,20 +1519,36 @@ class ScssParser extends Parser {
List<Statement> _children(Statement child()) {
scanner.expectChar($lbrace);
whitespace();
var children = <Statement>[];
while (true) {
children.addAll(_comments());
switch (scanner.peekChar()) {
case $dollar:
children.add(_variableDeclaration());
break;
case $slash:
switch (scanner.peekChar(1)) {
case $slash:
children.add(_silentComment());
break;
case $asterisk:
children.add(_loudComment());
break;
default:
children.add(child());
break;
}
break;
case $semicolon:
scanner.readChar();
whitespace();
break;
case $rbrace:
scanner.expectChar($rbrace);
whitespace();
return children;
default:
@ -1568,22 +1559,37 @@ class ScssParser extends Parser {
}
List<Statement> _statements(Statement statement()) {
var statements = <Statement>[]..addAll(_comments());
var statements = <Statement>[];
whitespace();
while (!scanner.isDone) {
switch (scanner.peekChar()) {
case $dollar:
statements.add(_variableDeclaration());
break;
case $slash:
switch (scanner.peekChar(1)) {
case $slash:
statements.add(_silentComment());
break;
case $asterisk:
statements.add(_loudComment());
break;
default:
statements.add(statement());
break;
}
break;
case $semicolon:
scanner.readChar();
whitespace();
break;
default:
statements.add(statement());
break;
}
statements.addAll(_comments());
}
return statements;
}