Merge branch 'master' into fixes

CHANGELOG.md

@@ -1,5 +1,14 @@
 ## 1.0.0-alpha.10
 
+* Drop support for the reference combinator. This has been removed from the
+  spec, and will be deprecated and eventually removed in other implementations.
+
+* Trust type annotations when compiling to JavaScript, which makes it
+  substantially faster.
+
+* Compile to minified JavaScript, which decreases the code size substantially
+  and makes startup a little faster.
+
 * Fix an `@extend` edge case where both the extender and the extended selector
   have invalid combinator sequences.
 

README.md

@@ -176,6 +176,8 @@ Sass to update the reference behavior.
 12. The old-style `:property value` syntax is not supported in the indented
     syntax. See [issue 2245][].
 
+13. The reference combinator is not supported. See [issue 303][].
+
 [issue 1599]: https://github.com/sass/sass/issues/1599
 [issue 1126]: https://github.com/sass/sass/issues/1126
 [issue 2120]: https://github.com/sass/sass/issues/2120
@@ -188,5 +190,6 @@ Sass to update the reference behavior.
 [issue 1050]: https://github.com/sass/sass/issues/1050
 [issue 2228]: https://github.com/sass/sass/issues/2228
 [issue 2245]: https://github.com/sass/sass/issues/2245
+[issue 303]: https://github.com/sass/sass/issues/303
 
 Disclaimer: this is not an official Google product.

lib/src/ast/selector/complex.dart

@@ -121,15 +121,3 @@ class Combinator implements ComplexSelectorComponent {
 
   String toString() => _text;
 }
-
-/// A reference combinator, like `/for/`.
-class ReferenceCombinator implements Combinator {
-  /// The name of the attribute being selected for.
-  final String name;
-
-  String get _text => "/$name/";
-
-  ReferenceCombinator(this.name);
-
-  String toString() => _text;
-}

lib/src/parse/selector.dart

@@ -94,12 +94,6 @@ class SelectorParser extends Parser {
           components.add(Combinator.followingSibling);
           break;
 
-        case $slash:
-          scanner.readChar();
-          components.add(new ReferenceCombinator(identifier()));
-          scanner.expectChar($slash);
-          break;
-
         case $lbracket:
         case $dot:
         case $hash:

pubspec.yaml

@@ -1,5 +1,5 @@
 name: sass
-version: 1.0.0-alpha.9
+version: 1.0.0-dev
 description: A Sass implementation in Dart.
 author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/sass/dart-sass

tool/grind.dart

@@ -58,6 +58,8 @@ js() {
   _ensureBuild();
   var destination = new File('build/sass.dart.js');
   Dart2js.compile(new File('bin/sass.dart'), outFile: destination, extraArgs: [
+    '--minify',
+    '--trust-type-annotations',
     '-Dnode=true',
     '-Dversion=$_version',
     '-Ddart-version=$_dartVersion',