Merge branch 'master' of github.com:sass/dart-sass into forward-with

Author: nex3

analysis/README.md

@@ -0,0 +1,14 @@
+This package provides a shared set of analysis options for use by Sass team
+packages. To use it, add it as a Git dependency to your `pubspec.yaml`:
+
+```yaml
+dev_dependencies:
+  sass_analysis:
+    git: {url: git://github.com/sass/dart-sass.git, path: analysis}
+```
+
+and include it in your `analysis_options.yaml`:
+
+```yaml
+include: package:sass_analysis/analysis_options.yaml
+```

analysis/lib/analysis_options.yaml

@@ -0,0 +1,26 @@
+analyzer:
+  strong-mode:
+    implicit-casts: false
+  language:
+    strict-inference: true
+    strict-raw-types: true
+  errors:
+    missing_js_lib_annotation: ignore
+    deprecated_member_use_from_same_package: ignore
+
+    # These are necessary for matching the JS API.
+    avoid_types_as_parameter_names: ignore
+
+    # This has tons of false positives for StreamSubscription.close().
+    unawaited_futures: ignore
+
+    # These are style preferences rather than potential semantic issues. While
+    # we're not intrinsically opposed to adopting them for consistency with the
+    # Dart ecosystem, there aren't currently any automated tools to help us
+    # migrate to and remain consistent with these style rules, so achieving
+    # consistency isn't worth the engineering time we'd spend getting there.
+    annotate_overrides: ignore
+    prefer_single_quotes: ignore
+    use_function_type_syntax_for_parameters: ignore
+
+include: package:pedantic/analysis_options.yaml

analysis/pubspec.yaml

@@ -0,0 +1,13 @@
+name: sass_analysis
+version: 0.0.0
+description: Shared analysis options for Sass team packages.
+author: Sass Team
+homepage: https://github.com/sass/dart-sass/tree/master/analysis
+
+publish_to: none
+
+environment:
+  sdk: ">=2.0.0 <3.0.0"
+
+dependencies:
+  pedantic: ^1.0.0

analysis_options.yaml

@@ -1,17 +1,6 @@
-analyzer:
-  strong-mode:
-    implicit-casts: false
-  language:
-    strict-inference: true
-    strict-raw-types: true
-  errors:
-    missing_js_lib_annotation: ignore
-    deprecated_member_use_from_same_package: ignore
-
-    # These are necessary for matching the JS API.
-    avoid_types_as_parameter_names: ignore
-
-    # This has tons of false positives for StreamSubscription.close().
-    unawaited_futures: ignore
-
-include: package:pedantic/analysis_options.yaml
+# We could depend on sass_analysis with a path dependency and include
+# package:sass_analysis/analysis_options.yaml, but path dependencies don't play
+# nicely with the logic we use to determine whether generated files are
+# out-of-date (because they cause "pub run" to modify the lockfile before it
+# runs the executable).
+include: analysis/lib/analysis_options.yaml

lib/src/ast/css/media_query.dart

@@ -81,7 +81,7 @@ class CssMediaQuery {
         } else {
           return MediaQueryMergeResult.unrepresentable;
         }
-      } else if (this.matchesAllTypes || other.matchesAllTypes) {
+      } else if (matchesAllTypes || other.matchesAllTypes) {
         return MediaQueryMergeResult.unrepresentable;
       }
 
@@ -116,7 +116,7 @@ class CssMediaQuery {
         // Otherwise, there's no way to represent the intersection.
         return MediaQueryMergeResult.unrepresentable;
       }
-    } else if (this.matchesAllTypes) {
+    } else if (matchesAllTypes) {
       modifier = theirModifier;
       // Omit the type if either input query did, since that indicates that they
       // aren't targeting a browser that requires "all and".

lib/src/ast/selector/list.dart

@@ -169,7 +169,7 @@ class SelectorList extends Selector {
       return null;
     }
 
-    Iterable<SimpleSelector> resolvedMembers = containsSelectorPseudo
+    var resolvedMembers = containsSelectorPseudo
         ? compound.components.map((simple) {
             if (simple is PseudoSelector) {
               if (simple.selector == null) return simple;

lib/src/ast/selector/pseudo.dart

@@ -135,7 +135,7 @@ class PseudoSelector extends SimpleSelector {
       if (simple is PseudoSelector && simple.isElement) {
         // A given compound selector may only contain one pseudo element. If
         // [compound] has a different one than [this], unification fails.
-        if (this.isElement) return null;
+        if (isElement) return null;
 
         // Otherwise, this is a pseudo selector and should come before pseduo
         // elements.

lib/src/callable/built_in.dart

@@ -85,6 +85,5 @@ class BuiltInCallable implements Callable, AsyncBuiltInCallable {
   }
 
   /// Returns a copy of this callable with the given [name].
-  BuiltInCallable withName(String name) =>
-      BuiltInCallable._(name, this._overloads);
+  BuiltInCallable withName(String name) => BuiltInCallable._(name, _overloads);
 }

lib/src/executable/options.dart

@@ -243,7 +243,7 @@ class ExecutableOptions {
     var stdin = _options['stdin'] as bool;
     if (_options.rest.isEmpty && !stdin) _fail("Compile Sass to CSS.");
 
-    var directories = Set<String>();
+    var directories = <String>{};
     var colonArgs = false;
     var positionalArgs = false;
     for (var argument in _options.rest) {
@@ -314,7 +314,7 @@ class ExecutableOptions {
     // Track [seen] separately from `sourcesToDestinations.keys` because we want
     // to report errors for sources as users entered them, rather than after
     // directories have been resolved.
-    var seen = Set<String>();
+    var seen = <String>{};
     var sourcesToDestinations = p.PathMap<String>();
     var sourceDirectoriesToDestinations = p.PathMap<String>();
     for (var argument in _options.rest) {

lib/src/executable/watch.dart

@@ -224,7 +224,7 @@ class _Watcher {
   ///
   /// Returns whether all recompilations succeeded.
   Future<bool> _recompileDownstream(Iterable<StylesheetNode> nodes) async {
-    var seen = Set<StylesheetNode>();
+    var seen = <StylesheetNode>{};
     var toRecompile = Queue.of(nodes);
 
     var allSucceeded = true;