fix tiny lint issues
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 9141625..2d3a54d 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -9,6 +9,7 @@
rules:
#- annotate_overrides
#- avoid_function_literals_in_foreach_calls
+ - avoid_empty_else
- avoid_init_to_null
- avoid_null_checks_in_equality_operators
- avoid_relative_lib_imports
@@ -44,18 +45,20 @@
#- prefer_collection_literals
#- prefer_conditional_assignment
- prefer_const_constructors
+ - prefer_equal_for_default_values
- prefer_final_fields
- prefer_initializing_formals
#- prefer_interpolation_to_compose_strings
#- prefer_single_quotes
#- prefer_typing_uninitialized_variables
+ - prefer_generic_function_type_aliases
+ - prefer_is_not_empty
- slash_for_doc_comments
- test_types_in_equals
- - super_goes_last
- - test_types_in_equals
- throw_in_finally
- type_init_formals
#- unnecessary_brace_in_string_interps
+ - unnecessary_brace_in_string_interps
- unnecessary_const
- unnecessary_getters_setters
- unnecessary_lambdas
@@ -63,3 +66,5 @@
- unnecessary_null_aware_assignments
- unnecessary_statements
- unnecessary_this
+ - unrelated_type_equality_checks
+ - valid_regexps
diff --git a/lib/dom_parsing.dart b/lib/dom_parsing.dart
index 4fc3707..ba2fccf 100644
--- a/lib/dom_parsing.dart
+++ b/lib/dom_parsing.dart
@@ -104,7 +104,7 @@
visitComment(Comment node) {
var data = htmlSerializeEscape(node.data);
- _str.write('<code class="markup comment"><!--${data}--></code>');
+ _str.write('<code class="markup comment"><!--$data--></code>');
}
}
diff --git a/lib/parser.dart b/lib/parser.dart
index 3f32178..58ae1c8 100644
--- a/lib/parser.dart
+++ b/lib/parser.dart
@@ -1190,7 +1190,7 @@
}
}
-typedef Token TokenProccessor(Token token);
+typedef TokenProccessor = Token Function(Token token);
class InBodyPhase extends Phase {
bool dropNewline = false;
diff --git a/lib/src/encoding_parser.dart b/lib/src/encoding_parser.dart
index 280e7dd..d61e76a 100644
--- a/lib/src/encoding_parser.dart
+++ b/lib/src/encoding_parser.dart
@@ -121,7 +121,7 @@
}
}
-typedef bool _MethodHandler();
+typedef _MethodHandler = bool Function();
class _DispatchEntry {
final String pattern;
@@ -373,4 +373,4 @@
return char == ">" || char == "<" || isWhitespace(char);
}
-typedef bool CharPreciate(String char);
+typedef CharPreciate = bool Function(String char);
diff --git a/lib/src/tokenizer.dart b/lib/src/tokenizer.dart
index 9f02b6c..48d6365 100644
--- a/lib/src/tokenizer.dart
+++ b/lib/src/tokenizer.dart
@@ -337,7 +337,7 @@
} else {
output = entities[entityName];
stream.unget(charStack.removeLast());
- output = '${output}${slice(charStack, entityLen).join()}';
+ output = '$output${slice(charStack, entityLen).join()}';
}
} else {
_addToken(ParseErrorToken("expected-named-entity"));
@@ -417,13 +417,13 @@
// state". At that point spaceCharacters are important so they are
// emitted separately.
_addToken(SpaceCharactersToken(
- '${data}${stream.charsUntil(spaceCharacters, true)}'));
+ '$data${stream.charsUntil(spaceCharacters, true)}'));
// No need to update lastFourChars here, since the first space will
// have already been appended to lastFourChars and will have broken
// any <!-- or --> sequences
} else {
var chars = stream.charsUntil("&<\u0000");
- _addToken(CharactersToken('${data}${chars}'));
+ _addToken(CharactersToken('$data$chars'));
}
return true;
}
@@ -451,10 +451,10 @@
// state". At that point spaceCharacters are important so they are
// emitted separately.
_addToken(SpaceCharactersToken(
- '${data}${stream.charsUntil(spaceCharacters, true)}'));
+ '$data${stream.charsUntil(spaceCharacters, true)}'));
} else {
var chars = stream.charsUntil("&<");
- _addToken(CharactersToken('${data}${chars}'));
+ _addToken(CharactersToken('$data$chars'));
}
return true;
}
@@ -477,7 +477,7 @@
return false;
} else {
var chars = stream.charsUntil("<\u0000");
- _addToken(CharactersToken("${data}${chars}"));
+ _addToken(CharactersToken("$data$chars"));
}
return true;
}
@@ -494,7 +494,7 @@
return false;
} else {
var chars = stream.charsUntil("<\u0000");
- _addToken(CharactersToken("${data}${chars}"));
+ _addToken(CharactersToken("$data$chars"));
}
return true;
}
@@ -508,7 +508,7 @@
_addToken(ParseErrorToken("invalid-codepoint"));
_addToken(CharactersToken("\uFFFD"));
} else {
- _addToken(CharactersToken('${data}${stream.charsUntil("\u0000")}'));
+ _addToken(CharactersToken('$data${stream.charsUntil("\u0000")}'));
}
return true;
}
@@ -782,7 +782,7 @@
state = dataState;
} else {
var chars = stream.charsUntil("<-\u0000");
- _addToken(CharactersToken("${data}${chars}"));
+ _addToken(CharactersToken("$data$chars"));
}
return true;
}
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
index 6d25b59..3c02494 100644
--- a/lib/src/utils.dart
+++ b/lib/src/utils.dart
@@ -3,7 +3,7 @@
import 'constants.dart';
-typedef bool Predicate();
+typedef Predicate = bool Function();
class Pair<F, S> {
final F first;
diff --git a/test/support.dart b/test/support.dart
index 0e7358c..8afbee0 100644
--- a/test/support.dart
+++ b/test/support.dart
@@ -9,7 +9,7 @@
import 'package:html/dom.dart';
import 'package:html/dom_parsing.dart';
-typedef TreeBuilder TreeBuilderFactory(bool namespaceHTMLElements);
+typedef TreeBuilderFactory = TreeBuilder Function(bool namespaceHTMLElements);
Map<String, TreeBuilderFactory> _treeTypes;
Map<String, TreeBuilderFactory> get treeTypes {
