Merge pull request #875 from sass/fix-analysis

Fix new analysis hints

Author: nex3

lib/sass.dart

@@ -185,7 +185,7 @@ String compileString(String source,
     Iterable<Callable> functions,
     OutputStyle style,
     Importer importer,
-    url,
+    Object url,
     void sourceMap(SingleMapping map),
     bool charset = true,
     @Deprecated("Use syntax instead.") bool indented = false}) {
@@ -250,7 +250,7 @@ Future<String> compileStringAsync(String source,
     Iterable<AsyncCallable> functions,
     OutputStyle style,
     AsyncImporter importer,
-    url,
+    Object url,
     void sourceMap(SingleMapping map),
     bool charset = true,
     @Deprecated("Use syntax instead.") bool indented = false}) async {

lib/src/ast/css/media_query.dart

@@ -32,7 +32,8 @@ class CssMediaQuery {
   /// If passed, [url] is the name of the file from which [contents] comes.
   ///
   /// Throws a [SassFormatException] if parsing fails.
-  static List<CssMediaQuery> parseList(String contents, {url, Logger logger}) =>
+  static List<CssMediaQuery> parseList(String contents,
+          {Object url, Logger logger}) =>
       MediaQueryParser(contents, url: url, logger: logger).parse();
 
   /// Creates a media query specifies a type and, optionally, features.
@@ -139,7 +140,7 @@ class CssMediaQuery {
         features: features));
   }
 
-  bool operator ==(other) =>
+  bool operator ==(Object other) =>
       other is CssMediaQuery &&
       other.modifier == modifier &&
       other.type == type &&

lib/src/ast/css/stylesheet.dart

@@ -26,7 +26,7 @@ class CssStylesheet extends CssParentNode {
       : children = UnmodifiableListView(children);
 
   /// Creates an empty stylesheet with the given source URL.
-  CssStylesheet.empty({url})
+  CssStylesheet.empty({Object url})
       : children = const [],
         span = SourceFile.decoded(const [], url: url).span(0, 0);
 

lib/src/ast/sass/argument_declaration.dart

@@ -53,7 +53,8 @@ class ArgumentDeclaration implements SassNode {
   /// If passed, [url] is the name of the file from which [contents] comes.
   ///
   /// Throws a [SassFormatException] if parsing fails.
-  factory ArgumentDeclaration.parse(String contents, {url, Logger logger}) =>
+  factory ArgumentDeclaration.parse(String contents,
+          {Object url, Logger logger}) =>
       ScssParser("($contents)", url: url, logger: logger)
           .parseArgumentDeclaration();
 

lib/src/ast/sass/at_root_query.dart

@@ -55,7 +55,7 @@ class AtRootQuery {
   /// If passed, [url] is the name of the file from which [contents] comes.
   ///
   /// Throws a [SassFormatException] if parsing fails.
-  factory AtRootQuery.parse(String contents, {url, Logger logger}) =>
+  factory AtRootQuery.parse(String contents, {Object url, Logger logger}) =>
       AtRootQueryParser(contents, url: url, logger: logger).parse();
 
   /// Returns whether [this] excludes [node].

lib/src/ast/sass/expression.dart

@@ -17,6 +17,6 @@ abstract class Expression implements SassNode {
   /// If passed, [url] is the name of the file from which [contents] comes.
   ///
   /// Throws a [SassFormatException] if parsing fails.
-  factory Expression.parse(String contents, {url, Logger logger}) =>
+  factory Expression.parse(String contents, {Object url, Logger logger}) =>
       ScssParser(contents, url: url, logger: logger).parseExpression();
 }

lib/src/ast/sass/statement/stylesheet.dart

@@ -58,7 +58,7 @@ class Stylesheet extends ParentStatement {
   ///
   /// Throws a [SassFormatException] if parsing fails.
   factory Stylesheet.parse(String contents, Syntax syntax,
-      {url, Logger logger}) {
+      {Object url, Logger logger}) {
     switch (syntax) {
       case Syntax.sass:
         return Stylesheet.parseSass(contents, url: url, logger: logger);
@@ -76,23 +76,23 @@ class Stylesheet extends ParentStatement {
   /// If passed, [url] is the name of the file from which [contents] comes.
   ///
   /// Throws a [SassFormatException] if parsing fails.
-  factory Stylesheet.parseSass(String contents, {url, Logger logger}) =>
+  factory Stylesheet.parseSass(String contents, {Object url, Logger logger}) =>
       SassParser(contents, url: url, logger: logger).parse();
 
   /// Parses an SCSS stylesheet from [contents].
   ///
   /// If passed, [url] is the name of the file from which [contents] comes.
   ///
   /// Throws a [SassFormatException] if parsing fails.
-  factory Stylesheet.parseScss(String contents, {url, Logger logger}) =>
+  factory Stylesheet.parseScss(String contents, {Object url, Logger logger}) =>
       ScssParser(contents, url: url, logger: logger).parse();
 
   /// Parses a plain CSS stylesheet from [contents].
   ///
   /// If passed, [url] is the name of the file from which [contents] comes.
   ///
   /// Throws a [SassFormatException] if parsing fails.
-  factory Stylesheet.parseCss(String contents, {url, Logger logger}) =>
+  factory Stylesheet.parseCss(String contents, {Object url, Logger logger}) =>
       CssParser(contents, url: url, logger: logger).parse();
 
   T accept<T>(StatementVisitor<T> visitor) => visitor.visitStylesheet(this);

lib/src/ast/sass/statement/use_rule.dart

@@ -38,7 +38,7 @@ class UseRule implements Statement {
   /// If passed, [url] is the name of the file from which [contents] comes.
   ///
   /// Throws a [SassFormatException] if parsing fails.
-  factory UseRule.parse(String contents, {url, Logger logger}) =>
+  factory UseRule.parse(String contents, {Object url, Logger logger}) =>
       ScssParser(contents, url: url, logger: logger).parseUseRule();
 
   T accept<T>(StatementVisitor<T> visitor) => visitor.visitUseRule(this);

lib/src/ast/sass/statement/variable_declaration.dart

@@ -67,7 +67,8 @@ class VariableDeclaration implements Statement {
   /// If passed, [url] is the name of the file from which [contents] comes.
   ///
   /// Throws a [SassFormatException] if parsing fails.
-  factory VariableDeclaration.parse(String contents, {url, Logger logger}) =>
+  factory VariableDeclaration.parse(String contents,
+          {Object url, Logger logger}) =>
       ScssParser(contents, url: url, logger: logger).parseVariableDeclaration();
 
   T accept<T>(StatementVisitor<T> visitor) =>

lib/src/ast/selector/attribute.dart

@@ -52,7 +52,7 @@ class AttributeSelector extends SimpleSelector {
   T accept<T>(SelectorVisitor<T> visitor) =>
       visitor.visitAttributeSelector(this);
 
-  bool operator ==(other) =>
+  bool operator ==(Object other) =>
       other is AttributeSelector &&
       other.name == name &&
       other.op == op &&