Enable more recent lints and enforce them

analysis_options.yaml

@@ -13,75 +13,162 @@ analyzer:
     # Will be analyzed anyway, nobody knows why ¯\_(ツ)_/¯. We're only analyzing lib/ and test/ as a workaround
     - ".dart_tool/build/entrypoint/build.dart"
     - "tool/**"
+
+# this should always include all rules. Those we don't use are commented out
 linter:
   rules:
-    - annotate_overrides
+# ERROR RULES
     - avoid_empty_else
-    - avoid_function_literals_in_foreach_calls
+#    - avoid_print (all our prints can be turned off)
-    - avoid_init_to_null
-    - avoid_null_checks_in_equality_operators
     - avoid_relative_lib_imports
+    - avoid_returning_null_for_future
+#    - avoid_slow_async_io
+    - avoid_types_as_parameter_names
+    - cancel_subscriptions
+    - close_sinks
+    - comment_references
+    - control_flow_in_finally
+#    - diagnostic_describe_all_properties (Flutter-specific, not relevant for us)
+    - empty_statements
+    - hash_and_equals
+#    - invariant_booleans (turned off because the lint rule is buggy)
+    - iterable_contains_unrelated_type
+    - list_remove_unrelated_type
+    - literal_only_boolean_expressions
+    - no_adjacent_strings_in_list
+    - no_duplicate_case_values
+#   - prefer_relative_imports (clashes with avoid_relative_lib_imports)
+#    - prefer_void_to_null (we do use Null as a type for alwaysThrows functions)
+    - test_types_in_equals
+    - throw_in_finally
+    - unnecessary_statements
+    - unrelated_type_equality_checks
+    - unsafe_html
+    - valid_regexps
+# STYLE RULES
+    - always_declare_return_types
+#    - always_put_control_body_on_new_line (we don't do this if it fits on the same line)
+#    - always_put_required_named_parameters_first (we just don't do this)
+#    - always_require_non_null_named_parameters (we don't use assert foo != null for parameters)
+#    - always_specify_types (we prefer to omit the type parameter when possible)
+    - annotate_overrides
+#    - avoid_annotating_with_dynamic (we prefer to make dynamic explicit)
+#    - avoid_as (we prefer to make explicit casts explicit!)
+    - avoid_bool_literals_in_conditional_expressions
+#    - avoid_catches_without_on_clauses (we have a lot of generic catches)
+    - avoid_catching_errors
+    - avoid_classes_with_only_static_members
+    - avoid_double_and_int_checks
+#    - avoid_equals_and_hash_code_on_mutable_classes (lint is to generic for transient fields)
+    - avoid_field_initializers_in_const_classes
+    - avoid_function_literals_in_foreach_calls
+#    - avoid_implementing_value_types (maybe we can consider turning this on?)
+    - avoid_init_to_null
+    - avoid_js_rounded_ints
+    - avoid_null_checks_in_equality_operators
+#    - avoid_positional_boolean_parameters (there pretty useful when there's only one boolean param)
+#    - avoid_private_typedef_functions (they're still useful)
+    - avoid_renaming_method_parameters
     - avoid_return_types_on_setters
     - avoid_returning_null
-    - avoid_types_as_parameter_names
+    - avoid_returning_null_for_void
+    - avoid_returning_this
+    - avoid_setters_without_getters
+    - avoid_shadowing_type_parameters
+    - avoid_single_cascade_in_expression_statements
+#    - avoid_types_on_closure_parameters (the interference isn't THAT good)
+#    - avoid_unnecessary_containers (Flutter-specific, not relevant here)
     - avoid_unused_constructor_parameters
+    - avoid_void_async
     - await_only_futures
+    - camel_case_extensions
     - camel_case_types
-    - cancel_subscriptions
+#    - cascade_invocations (sometimes the explicit notation is more readable)
-    - comment_references
     - constant_identifier_names
     - curly_braces_in_flow_control_structures
-    - control_flow_in_finally
     - directives_ordering
     - empty_catches
     - empty_constructor_bodies
-    - empty_statements
+    - file_names
-    - hash_and_equals
+#    - flutter_style_todos (Flutter-development specific, not relevant here)
     - implementation_imports
-    - invariant_booleans
+    - join_return_with_assignment
-    - iterable_contains_unrelated_type
     - library_names
     - library_prefixes
-    - list_remove_unrelated_type
+    - lines_longer_than_80_chars
-    - no_adjacent_strings_in_list
-    - no_duplicate_case_values
     - non_constant_identifier_names
     - null_closures
     - omit_local_variable_types
+#    - one_member_abstracts (there are cases where a one-member abstract class makes sense, see moor's Insertable)
     - only_throw_errors
     - overridden_fields
     - package_api_docs
-    - package_names
+#    - package_prefixed_library_names (this isn't java)
-    - package_prefixed_library_names
+#    - parameter_assignments (we regularly use this to set default values)
     - prefer_adjacent_string_concatenation
+    - prefer_asserts_in_initializer_lists
+#    - prefer_asserts_with_message (it's annoying to write messages for internal invariants)
     - prefer_collection_literals
     - prefer_conditional_assignment
     - prefer_const_constructors
+    - prefer_const_constructors_in_immutables
+    - prefer_const_declarations
+    - prefer_const_literals_to_create_immutables
+    - prefer_constructors_over_static_methods
     - prefer_contains
+#    - prefer_double_quotes (we prefer single quotes)
     - prefer_equal_for_default_values
+#    - prefer_expression_function_bodies (for multiline expressions, this is ugly to format)
     - prefer_final_fields
+    - prefer_final_in_for_each
     - prefer_final_locals
+    - prefer_for_elements_to_map_fromIterable
+    - prefer_foreach
+    - prefer_function_declarations_over_variables
+    - prefer_generic_function_type_aliases
+    - prefer_if_elements_to_conditional_expressions
+    - prefer_if_null_operators
     - prefer_initializing_formals
+    - prefer_inlined_adds
+    - prefer_int_literals
     - prefer_interpolation_to_compose_strings
     - prefer_is_empty
     - prefer_is_not_empty
+#    - prefer_is_not_operator todo enable after upgrading to Dart 2.7.0
+    - prefer_iterable_whereType
+#    - prefer_mixin (todo we could consider enabling this)
+    - prefer_null_aware_operators
     - prefer_single_quotes
+    - prefer_spread_collections
     - prefer_typing_uninitialized_variables
+    - provide_deprecation_message
+    - public_member_api_docs
     - recursive_getters
     - slash_for_doc_comments
-    - test_types_in_equals
+#    - sort_child_properties_last (Flutter specific)
-    - throw_in_finally
+#    - sort_constructors_first (we don't do this)
+#    - sort_unnamed_constructors_first
+    - type_annotate_public_apis
     - type_init_formals
     - unawaited_futures
     - unnecessary_brace_in_string_interps
+    - unnecessary_const
+#    - unnecessary_final (we prefer final here)
     - unnecessary_getters_setters
     - unnecessary_lambdas
     - unnecessary_new
-    - unnecessary_const
     - unnecessary_null_aware_assignments
-    - unnecessary_statements
+    - unnecessary_null_in_if_null_operators
+    - unnecessary_overrides
+    - unnecessary_parenthesis
     - unnecessary_this
-    - unrelated_type_equality_checks
+#    - use_full_hex_values_for_flutter_colors (Flutter specific)
+    - use_function_type_syntax_for_parameters
     - use_rethrow_when_possible
-    - valid_regexps
+    - use_setters_to_change_properties
-    - public_member_api_docs
+    - use_string_buffers
+#    - use_to_and_as_if_applicable (false positive on operators)
+    - void_checks
+# PUB RULES
+    - package_names
+#   - sort_pub_dependencies (we prefer to group them by what they do)

extras/coverage_formatting/bin/coverage.dart

@@ -11,9 +11,11 @@ import 'dart:io';
 import 'package:coverage/coverage.dart';
 import 'package:path/path.dart' as p;
 
-final outputFile = File('lcov.info');
+// ignore_for_file: avoid_print
 
-void main() async {
+final File outputFile = File('lcov.info');
+
+Future<void> main() async {
   if (outputFile.existsSync()) {
     outputFile.deleteSync();
   }

extras/encryption/lib/encrypted_moor.dart

@@ -115,8 +115,8 @@ mixin _SqfliteExecutor on QueryDelegate {
   Future<void> runBatched(List<BatchedStatement> statements) async {
     final batch = db.batch();
 
-    for (var statement in statements) {
+    for (final statement in statements) {
-      for (var boundVariables in statement.variables) {
+      for (final boundVariables in statement.variables) {
         batch.execute(statement.sql, boundVariables);
       }
     }

extras/integration_tests/flutter_db/lib/ffi.dart

@@ -26,7 +26,7 @@ class FfiExecutor extends TestExecutor {
   }
 }
 
-void main() async {
+Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
   final dbPath = await getDatabasesPath();

extras/integration_tests/flutter_db/lib/main.dart

@@ -28,7 +28,7 @@ class SqfliteExecutor extends TestExecutor {
   }
 }
 
-void main() async {
+Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
   runAllTests(SqfliteExecutor());

extras/integration_tests/tests/lib/data/sample_data.dart

@@ -1,27 +1,25 @@
 import 'package:moor/moor.dart';
 import 'package:tests/database/database.dart';
 
-class People {
+const int dashId = 1, dukeId = 2, gopherId = 3;
-  static const int dashId = 1, dukeId = 2, gopherId = 3;
 
-  static UsersCompanion dash = UsersCompanion(
+UsersCompanion dash = UsersCompanion(
-    name: const Value('Dash'),
+  name: const Value('Dash'),
-    birthDate: Value(DateTime(2011, 10, 11)),
+  birthDate: Value(DateTime(2011, 10, 11)),
-  );
+);
 
-  static UsersCompanion duke = UsersCompanion(
+UsersCompanion duke = UsersCompanion(
-    name: const Value('Duke'),
+  name: const Value('Duke'),
-    birthDate: Value(DateTime(1996, 1, 23)),
+  birthDate: Value(DateTime(1996, 1, 23)),
-  );
+);
 
-  static UsersCompanion gopher = UsersCompanion(
+UsersCompanion gopher = UsersCompanion(
-    name: const Value('Go Gopher'),
+  name: const Value('Go Gopher'),
-    birthDate: Value(DateTime(2012, 3, 28)),
+  birthDate: Value(DateTime(2012, 3, 28)),
-  );
+);
 
-  static UsersCompanion florian = UsersCompanion(
+UsersCompanion florian = UsersCompanion(
-    name: const Value(
+  name: const Value(
-        'Florian, the fluffy Ferret from Florida familiar with Flutter'),
+      'Florian, the fluffy Ferret from Florida familiar with Flutter'),
-    birthDate: Value(DateTime(2015, 4, 29)),
+  birthDate: Value(DateTime(2015, 4, 29)),
-  );
+);
-}

extras/integration_tests/tests/lib/database/database.dart

@@ -3,7 +3,7 @@ import 'dart:convert';
 import 'package:json_annotation/json_annotation.dart' as j;
 import 'package:moor/moor.dart';
 
-import 'package:tests/data/sample_data.dart';
+import 'package:tests/data/sample_data.dart' as people;
 
 part 'database.g.dart';
 
@@ -65,10 +65,12 @@ class PreferenceConverter extends TypeConverter<Preferences, String> {
 @UseMoor(
   tables: [Users, Friendships],
   queries: {
-    'mostPopularUsers':
+    'mostPopularUsers': 'SELECT * FROM users u '
-        'SELECT * FROM users u ORDER BY (SELECT COUNT(*) FROM friendships WHERE first_user = u.id OR second_user = u.id) DESC LIMIT :amount',
+        'ORDER BY (SELECT COUNT(*) FROM friendships '
+        'WHERE first_user = u.id OR second_user = u.id) DESC LIMIT :amount',
     'amountOfGoodFriends':
-        'SELECT COUNT(*) FROM friendships f WHERE f.really_good_friends AND (f.first_user = :user OR f.second_user = :user)',
+        'SELECT COUNT(*) FROM friendships f WHERE f.really_good_friends AND '
+            '(f.first_user = :user OR f.second_user = :user)',
     'friendsOf': '''SELECT u.* FROM friendships f
          INNER JOIN users u ON u.id IN (f.first_user, f.second_user) AND
            u.id != :user
@@ -103,7 +105,7 @@ class Database extends _$Database {
         if (details.wasCreated) {
           // make sure that transactions can be used in the beforeOpen callback.
           await transaction(() async {
-            for (var user in [People.dash, People.duke, People.gopher]) {
+            for (final user in [people.dash, people.duke, people.gopher]) {
               await into(users).insert(user);
             }
           });

extras/integration_tests/tests/lib/suite/migrations.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:tests/data/sample_data.dart';
+import 'package:tests/data/sample_data.dart' as people;
 import 'package:tests/database/database.dart';
 
 import 'suite.dart';
@@ -17,7 +17,7 @@ void migrationTests(TestExecutor executor) {
 
   test('saves and restores database', () async {
     var database = Database(executor.createExecutor(), schemaVersion: 1);
-    await database.writeUser(People.florian);
+    await database.writeUser(people.florian);
     await database.close();
 
     database = Database(executor.createExecutor(), schemaVersion: 2);

extras/integration_tests/tests/lib/suite/transactions.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:tests/data/sample_data.dart';
+import 'package:tests/data/sample_data.dart' as people;
 import 'package:tests/database/database.dart';
 
 import 'suite.dart';
@@ -10,9 +10,9 @@ void transactionTests(TestExecutor executor) {
 
     // ignore: invalid_use_of_protected_member, invalid_use_of_visible_for_testing_member
     await db.transaction(() async {
-      final florianId = await db.writeUser(People.florian);
+      final florianId = await db.writeUser(people.florian);
 
-      final dash = await db.getUserById(People.dashId);
+      final dash = await db.getUserById(people.dashId);
       final florian = await db.getUserById(florianId);
 
       await db.makeFriends(dash, florian, goodFriends: true);
@@ -21,7 +21,7 @@ void transactionTests(TestExecutor executor) {
     final countResult = await db.userCount();
     expect(countResult.single, 4);
 
-    final friendsResult = await db.amountOfGoodFriends(People.dashId);
+    final friendsResult = await db.amountOfGoodFriends(people.dashId);
     expect(friendsResult.single, 1);
 
     await db.close();
@@ -33,9 +33,9 @@ void transactionTests(TestExecutor executor) {
     try {
       // ignore: invalid_use_of_protected_member, invalid_use_of_visible_for_testing_member
       await db.transaction(() async {
-        final florianId = await db.writeUser(People.florian);
+        final florianId = await db.writeUser(people.florian);
 
-        final dash = await db.getUserById(People.dashId);
+        final dash = await db.getUserById(people.dashId);
         final florian = await db.getUserById(florianId);
 
         await db.makeFriends(dash, florian, goodFriends: true);
@@ -47,7 +47,7 @@ void transactionTests(TestExecutor executor) {
     final countResult = await db.userCount();
     expect(countResult.single, 3); // only the default folks
 
-    final friendsResult = await db.amountOfGoodFriends(People.dashId);
+    final friendsResult = await db.amountOfGoodFriends(people.dashId);
     expect(friendsResult.single, 0); // no friendship was inserted
 
     await db.close();

extras/integration_tests/vm/test/vm_test.dart

@@ -7,7 +7,7 @@ import 'package:path/path.dart' show join;
 
 class VmExecutor extends TestExecutor {
   static String fileName = 'moor-vm-tests-${DateTime.now().toIso8601String()}';
-  final file = File(join(Directory.systemTemp.path, fileName));
+  final File file = File(join(Directory.systemTemp.path, fileName));
 
   @override
   QueryExecutor createExecutor() {

extras/integration_tests/web/test/integration_test.dart

@@ -6,7 +6,7 @@ import 'package:test/test.dart';
 import 'package:moor/moor_web.dart';
 
 class WebExecutor extends TestExecutor {
-  final name = 'db';
+  final String name = 'db';
 
   @override
   QueryExecutor createExecutor() {

extras/mysql/lib/moor_mysql.dart

@@ -18,7 +18,7 @@ mixin _MySqlExecutor on QueryDelegate {
 
   @override
   Future<void> runBatched(List<BatchedStatement> statements) async {
-    for (var stmt in statements) {
+    for (final stmt in statements) {
       await _querier.preparedMulti(stmt.sql, stmt.variables);
     }
   }

moor/lib/src/dsl/columns.dart

@@ -153,7 +153,7 @@ class IntColumnBuilder
     extends ColumnBuilder<IntColumnBuilder, IntColumn, IntType, int> {
   /// Enables auto-increment for this column, which will also make this column
   /// the primary key of the table.
-  IntColumnBuilder autoIncrement() => this;
+  IntColumnBuilder autoIncrement() => null;
 }
 
 /// Tells the generator to build an [BoolColumn]. See the docs at
@@ -181,7 +181,7 @@ class TextColumnBuilder
   /// string so that [String.length] is smaller than [min], the query will throw
   /// an exception when executed and no data will be written. The same applies
   /// for [max].
-  TextColumnBuilder withLength({int min, int max}) => this;
+  TextColumnBuilder withLength({int min, int max}) => null;
 }
 
 /// Tells the generator to build an [DateTimeColumn]. See the docs at

moor/lib/src/dsl/database.dart

@@ -10,7 +10,8 @@ part of 'dsl.dart';
 /// a [QueryEngine] to use moor:
 /// ```dart
 /// class MyDatabase extends _$MyDatabase { // _$MyDatabase was generated
-///   MyDatabase() : super(FlutterQueryExecutor.inDatabaseFolder(path: 'path.db'));
+///   MyDatabase():
+///     super(FlutterQueryExecutor.inDatabaseFolder(path: 'path.db'));
 /// }
 /// ```
 class UseMoor {

moor/lib/src/runtime/api/batch.dart

@@ -45,7 +45,7 @@ class Batch {
   void insertAll<D extends DataClass>(
       TableInfo<Table, D> table, List<Insertable<D>> rows,
       {InsertMode mode}) {
-    for (var row in rows) {
+    for (final row in rows) {
       insert<D>(table, row, mode: mode);
     }
   }
@@ -86,7 +86,7 @@ class Batch {
   /// Helper that calls [replace] for all [rows].
   void replaceAll<T extends Table, D extends DataClass>(
       TableInfo<T, D> table, List<Insertable<D>> rows) {
-    for (var row in rows) {
+    for (final row in rows) {
       replace(table, row);
     }
   }

moor/lib/src/runtime/api/db_base.dart

@@ -60,13 +60,15 @@ abstract class GeneratedDatabase extends DatabaseConnectionUser
     }
     final count = ++_openedDbCount[runtimeType];
     if (count > 1) {
+      // ignore: avoid_print
       print(
         'WARNING (moor): It looks like you\'ve created the database class'
         '$runtimeType multiple times. When these two databases use the same '
         'QueryExecutor, race conditions will ocur and might corrupt the '
         'database. \n'
         'Try to follow the advice at https://moor.simonbinder.eu/faq/#using-the-database '
-        'or, if you know what you\'re doing, set moorRuntimeOptions.dontWarnAboutMultipleDatabases = true\n'
+        'or, if you know what you\'re doing, set '
+        'moorRuntimeOptions.dontWarnAboutMultipleDatabases = true\n'
         'Here is the stacktrace from when the database was opened a second '
         'time:\n${StackTrace.current}\n'
         'This warning will only appear on debug builds.',

moor/lib/src/runtime/api/query_engine.dart

@@ -245,7 +245,7 @@ mixin QueryEngine on DatabaseConnectionUser {
           rethrow;
         } finally {
           if (success) {
-            // calling complete will also take care of committing the transaction
+            // complete() will also take care of committing the transaction
             await transaction.complete();
           }
         }

moor/lib/src/runtime/data_class.dart

@@ -100,7 +100,7 @@ class _DefaultValueSerializer extends ValueSerializer {
   const _DefaultValueSerializer();
 
   @override
-  T fromJson<T>(json) {
+  T fromJson<T>(dynamic json) {
     if (T == DateTime) {
       if (json == null) {
         return null;

moor/lib/src/runtime/exceptions.dart

@@ -34,6 +34,7 @@ class MoorWrappedException implements Exception {
 
   @override
   String toString() {
-    return '$cause at \n$trace\nMoor detected a possible cause for this: $message';
+    return '$cause at \n$trace\n'
+        'Moor detected a possible cause for this: $message';
   }
 }

moor/lib/src/runtime/executor/executor.dart

@@ -25,7 +25,7 @@ abstract class QueryExecutor {
 
   /// Performs the async [fn] after this executor is ready, or directly if it's
   /// already ready.
-  Future<T> doWhenOpened<T>(FutureOr<T> fn(QueryExecutor e)) {
+  Future<T> doWhenOpened<T>(FutureOr<T> Function(QueryExecutor e) fn) {
     return ensureOpen().then((_) => fn(this));
   }
 
@@ -87,7 +87,7 @@ class BatchedStatement {
   }
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other is BatchedStatement &&
             other.sql == sql &&

moor/lib/src/runtime/executor/helpers/delegates.dart

@@ -46,8 +46,9 @@ abstract class DatabaseDelegate implements QueryDelegate {
   /// multiple times.
   ///
   /// The [GeneratedDatabase] is the user-defined database annotated with
-  /// [UseMoor]. It might be useful to read the [GeneratedDatabase.schemaVersion]
+  /// [UseMoor]. It might be useful to read the
-  /// if that information is required while opening the database.
+  /// [GeneratedDatabase.schemaVersion] if that information is required while
+  /// opening the database.
   Future<void> open([GeneratedDatabase db]);
 
   /// Closes this database. When the future completes, all resources used
@@ -96,8 +97,8 @@ abstract class QueryDelegate {
   /// [BatchedStatement], which can be executed multiple times.
   Future<void> runBatched(List<BatchedStatement> statements) async {
     // default, inefficient implementation
-    for (var stmt in statements) {
+    for (final stmt in statements) {
-      for (var boundVars in stmt.variables) {
+      for (final boundVars in stmt.variables) {
         await runCustom(stmt.sql, boundVars);
       }
     }

moor/lib/src/runtime/executor/stream_queries.dart

@@ -52,7 +52,7 @@ class StreamKey {
   }
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other is StreamKey &&
             other.sql == sql &&
@@ -61,8 +61,8 @@ class StreamKey {
   }
 }
 
-/// Keeps track of active streams created from [SimpleSelectStatement]s and updates
+/// Keeps track of active streams created from [SimpleSelectStatement]s and
-/// them when needed.
+/// updates them when needed.
 class StreamQueryStore {
   final Map<StreamKey, QueryStream> _activeKeyStreams = {};
   final HashSet<StreamKey> _keysPendingRemoval = HashSet<StreamKey>();

moor/lib/src/runtime/isolate/communication.dart

@@ -66,7 +66,7 @@ class IsolateCommunication {
     _inputSubscription?.cancel();
     _closeCompleter.complete();
 
-    for (var pending in _pendingRequests.values) {
+    for (final pending in _pendingRequests.values) {
       pending.completeError(StateError('connection closed'));
     }
     _pendingRequests.clear();
@@ -191,7 +191,7 @@ class Server {
     _openConnectionPort.close();
     _opened.close();
 
-    for (var connected in currentChannels) {
+    for (final connected in currentChannels) {
       connected.close();
     }
   }

moor/lib/src/runtime/isolate/moor_isolate.dart

@@ -81,7 +81,7 @@ class MoorIsolate {
   /// [MoorIsolate] is an object than can be sent across isolates - any other
   /// isolate can then use [MoorIsolate.connect] to obtain a special database
   /// connection which operations are all executed on this isolate.
-  static MoorIsolate inCurrent(DatabaseOpener opener) {
+  factory MoorIsolate.inCurrent(DatabaseOpener opener) {
     final server = _MoorServer(opener);
     return MoorIsolate._(server.key);
   }

moor/lib/src/runtime/isolate/server.dart

@@ -55,7 +55,7 @@ class _MoorServer {
     } else if (payload is _ExecuteBatchedStatement) {
       return connection.executor.runBatched(payload.stmts);
     } else if (payload is _NotifyTablesUpdated) {
-      for (var connected in server.currentChannels) {
+      for (final connected in server.currentChannels) {
         connected.request(payload);
       }
     } else if (payload is _RunTransactionAction) {

moor/lib/src/runtime/query_builder/components/order_by.dart

@@ -56,7 +56,7 @@ class OrderBy extends Component {
       context.buffer.write('ORDER BY ');
     }
 
-    for (var term in terms) {
+    for (final term in terms) {
       if (first) {
         first = false;
       } else {

moor/lib/src/runtime/query_builder/expressions/bools.dart

@@ -60,7 +60,7 @@ class _NotExpression extends Expression<bool, BoolType> {
   int get hashCode => inner.hashCode << 1;
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return other is _NotExpression && other.inner == inner;
   }
 }

moor/lib/src/runtime/query_builder/expressions/comparable.dart

@@ -110,7 +110,7 @@ class _BetweenExpression extends Expression<bool, BoolType> {
       $mrjc(lower.hashCode, $mrjc(higher.hashCode, not.hashCode))));
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return other is _BetweenExpression &&
         other.target == target &&
         other.not == not &&

moor/lib/src/runtime/query_builder/expressions/custom.dart

@@ -21,7 +21,7 @@ class CustomExpression<D, S extends SqlType<D>> extends Expression<D, S> {
   int get hashCode => content.hashCode * 3;
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return other.runtimeType == runtimeType &&
         // ignore: test_types_in_equals
         (other as CustomExpression).content == content;

moor/lib/src/runtime/query_builder/expressions/datetimes.dart

@@ -49,7 +49,7 @@ const Expression<DateTime, DateTimeType> currentDateAndTime =
 class _CustomDateTimeExpression
     extends CustomExpression<DateTime, DateTimeType> {
   @override
-  final Precedence precedence = Precedence.primary;
+  Precedence get precedence => Precedence.primary;
 
   const _CustomDateTimeExpression(String content) : super(content);
 }
@@ -108,7 +108,7 @@ class _StrftimeSingleFieldExpression extends Expression<int, IntType> {
   int get hashCode => $mrjf($mrjc(format.hashCode, date.hashCode));
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return other is _StrftimeSingleFieldExpression &&
         other.format == format &&
         other.date == date;

moor/lib/src/runtime/query_builder/expressions/expression.dart

@@ -99,7 +99,7 @@ class Precedence implements Comparable<Precedence> {
   int get hashCode => _value;
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     // runtimeType comparison isn't necessary, the private constructor prevents
     // subclasses
     return other is Precedence && other._value == _value;
@@ -183,7 +183,7 @@ abstract class _InfixOperator<D, T extends SqlType<D>>
       $mrjf($mrjc(left.hashCode, $mrjc(right.hashCode, operator.hashCode)));
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return other is _InfixOperator &&
         other.left == left &&
         other.right == right &&
@@ -208,7 +208,8 @@ class _BaseInfixOperator<D, T extends SqlType<D>> extends _InfixOperator<D, T> {
       {this.precedence = Precedence.unknown});
 }
 
-/// Defines the possible comparison operators that can appear in a [_Comparison].
+/// Defines the possible comparison operators that can appear in a
+/// [_Comparison].
 enum _ComparisonOperator {
   /// '<' in sql
   less,
@@ -282,7 +283,7 @@ class _UnaryMinus<DT, ST extends SqlType<DT>> extends Expression<DT, ST> {
   int get hashCode => inner.hashCode * 5;
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return other is _UnaryMinus && other.inner == inner;
   }
 }
@@ -308,7 +309,7 @@ class _CastExpression<D1, D2, S1 extends SqlType<D1>, S2 extends SqlType<D2>>
   int get hashCode => inner.hashCode * 7;
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return other is _CastExpression && other.inner == inner;
   }
 }
@@ -353,7 +354,7 @@ class FunctionCallExpression<R, S extends SqlType<R>> extends Expression<R, S> {
       $mrjf($mrjc(functionName.hashCode, _equality.hash(arguments)));
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return other is FunctionCallExpression &&
         other.functionName == functionName &&
         _equality.equals(other.arguments, arguments);

moor/lib/src/runtime/query_builder/expressions/in.dart

@@ -43,7 +43,7 @@ class _InExpression<X extends SqlType<T>, T>
     context.buffer.write('(');
 
     var first = true;
-    for (var value in _values) {
+    for (final value in _values) {
       final variable = Variable<T, X>(value);
 
       if (first) {
@@ -63,7 +63,7 @@ class _InExpression<X extends SqlType<T>, T>
       _expression.hashCode, $mrjc(_equality.hash(_values), _not.hashCode)));
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return other is _InExpression &&
         other._expression == _expression &&
         other._values == _values &&

moor/lib/src/runtime/query_builder/expressions/null_check.dart

@@ -35,7 +35,7 @@ class _NullCheck extends Expression<bool, BoolType> {
   int get hashCode => $mrjf($mrjc(_inner.hashCode, _isNull.hashCode));
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return other is _NullCheck &&
         other._inner == _inner &&
         other._isNull == _isNull;

moor/lib/src/runtime/query_builder/expressions/text.dart

@@ -77,7 +77,7 @@ class _LikeOperator extends Expression<bool, BoolType> {
   int get hashCode => $mrjf($mrjc(target.hashCode, regex.hashCode));
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return other is _LikeOperator &&
         other.target == target &&
         other.regex == regex;
@@ -130,7 +130,7 @@ class _CollateOperator extends Expression<String, StringType> {
   int get hashCode => $mrjf($mrjc(inner.hashCode, collate.hashCode));
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return other is _CollateOperator &&
         other.inner == inner &&
         other.collate == collate;

moor/lib/src/runtime/query_builder/expressions/variables.dart

@@ -1,5 +1,8 @@
 part of '../query_builder.dart';
 
+// ignoring the lint because we can't have parameterized factories
+// ignore_for_file: prefer_constructors_over_static_methods
+
 /// An expression that represents the value of a dart object encoded to sql
 /// using prepared statements.
 class Variable<T, S extends SqlType<T>> extends Expression<T, S> {
@@ -10,7 +13,7 @@ class Variable<T, S extends SqlType<T>> extends Expression<T, S> {
   // get its own index in sqlite and is thus different.
 
   @override
-  final Precedence precedence = Precedence.primary;
+  Precedence get precedence => Precedence.primary;
 
   /// Constructs a new variable from the [value].
   const Variable(this.value);
@@ -72,13 +75,13 @@ class Constant<T, S extends SqlType<T>> extends Expression<T, S> {
   const Constant(this.value);
 
   @override
-  final Precedence precedence = Precedence.primary;
+  Precedence get precedence => Precedence.primary;
 
   /// The value that will be converted to an sql literal.
   final T value;
 
   @override
-  final bool isLiteral = true;
+  bool get isLiteral => true;
 
   @override
   void writeInto(GenerationContext context) {
@@ -90,7 +93,7 @@ class Constant<T, S extends SqlType<T>> extends Expression<T, S> {
   int get hashCode => value.hashCode;
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return other.runtimeType == runtimeType &&
         // ignore: test_types_in_equals
         (other as Constant<T, S>).value == value;

moor/lib/src/runtime/query_builder/migration.dart

@@ -1,15 +1,15 @@
 part of 'query_builder.dart';
 
 /// Signature of a function that will be invoked when a database is created.
-typedef Future<void> OnCreate(Migrator m);
+typedef OnCreate = Future<void> Function(Migrator m);
 
 /// Signature of a function that will be invoked when a database is upgraded.
-typedef Future<void> OnUpgrade(Migrator m, int from, int to);
+typedef OnUpgrade = Future<void> Function(Migrator m, int from, int to);
 
 /// Signature of a function that's called after a migration has finished and the
 /// database is ready to be used. Useful to populate data.
-@deprecated
+@Deprecated('This is never used')
-typedef Future<void> OnMigrationFinished();
+typedef OnMigrationFinished = Future<void> Function();
 
 /// Signature of a function that's called before a database is marked opened by
 /// moor, but after migrations took place. This is a suitable callback to to
@@ -48,7 +48,7 @@ class MigrationStrategy {
 }
 
 /// A function that executes queries and ignores what they return.
-typedef Future<void> SqlExecutor(String sql, [List<dynamic> args]);
+typedef SqlExecutor = Future<void> Function(String sql, [List<dynamic> args]);
 
 /// Runs migrations declared by a [MigrationStrategy].
 class Migrator {
@@ -60,7 +60,7 @@ class Migrator {
 
   /// Creates all tables specified for the database, if they don't exist
   Future<void> createAllTables() async {
-    for (var table in _db.allTables) {
+    for (final table in _db.allTables) {
       await createTable(table);
     }
   }

moor/lib/src/runtime/query_builder/schema/columns.dart

@@ -106,7 +106,7 @@ abstract class GeneratedColumn<T, S extends SqlType<T>> extends Column<T, S> {
   int get hashCode => $mrjf($mrjc(tableName.hashCode, $name.hashCode));
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     if (other.runtimeType != runtimeType) return false;
 
     // ignore: test_types_in_equals

moor/lib/src/runtime/query_builder/schema/table_info.dart

@@ -63,7 +63,7 @@ mixin TableInfo<TableDsl extends Table, D extends DataClass> on Table {
   TableInfo<TableDsl, D> createAlias(String alias);
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     // tables are singleton instances except for aliases
     if (other is TableInfo) {
       return other.runtimeType == runtimeType && other.$tableName == $tableName;

moor/lib/src/runtime/query_builder/statements/insert.dart

@@ -71,7 +71,7 @@ class InsertStatement<D extends DataClass> {
     // Not every insert has the same sql, as fields which are set to null are
     // not included. So, we have a map for sql -> list of variables which we can
     // then turn into prepared statements
-    for (var row in rows) {
+    for (final row in rows) {
       final ctx = createContext(row, _resolveMode(mode, orReplace));
       statements.putIfAbsent(ctx.sql, () => []).add(ctx);
     }
@@ -115,7 +115,7 @@ class InsertStatement<D extends DataClass> {
         ..write('VALUES (');
 
       var first = true;
-      for (var variable in map.values) {
+      for (final variable in map.values) {
         if (!first) {
           ctx.buffer.write(', ');
         }

moor/lib/src/runtime/query_builder/statements/query.dart

@@ -90,7 +90,8 @@ abstract class Selectable<T> {
   /// ```dart
   /// Future<TodoEntry> loadMostImportant() {
   ///   return (select(todos)
-  ///    ..orderBy([(t) => OrderingTerm(expression: t.priority, mode: OrderingMode.desc)])
+  ///    ..orderBy([(t) =>
+  ///       OrderingTerm(expression: t.priority, mode: OrderingMode.desc)])
   ///    ..limit(1)
   ///   ).getSingle();
   /// }
@@ -178,7 +179,7 @@ mixin SingleTableQueryMixin<T extends Table, D extends DataClass>
   ///    which explains how to express most SQL expressions in Dart.
   /// If you want to remove duplicate rows from a query, use the `distinct`
   /// parameter on [QueryEngine.select].
-  void where(Expression<bool, BoolType> filter(T tbl)) {
+  void where(Expression<bool, BoolType> Function(T tbl) filter) {
     final predicate = filter(table.asDslTable);
 
     if (whereExpr == null) {
@@ -218,7 +219,7 @@ mixin SingleTableQueryMixin<T extends Table, D extends DataClass>
     });
 
     Expression<bool, BoolType> predicate;
-    for (var entry in primaryKeyValues.entries) {
+    for (final entry in primaryKeyValues.entries) {
       final comparison =
           _Comparison(entry.key, _ComparisonOperator.equal, entry.value);
 

moor/lib/src/runtime/query_builder/statements/select/select.dart

@@ -2,7 +2,7 @@ part of '../../query_builder.dart';
 
 /// Signature of a function that generates an [OrderingTerm] when provided with
 /// a table.
-typedef OrderingTerm OrderClauseGenerator<T>(T tbl);
+typedef OrderClauseGenerator<T> = OrderingTerm Function(T tbl);
 
 /// A select statement that doesn't use joins
 class SimpleSelectStatement<T extends Table, D extends DataClass>
@@ -91,7 +91,8 @@ class SimpleSelectStatement<T extends Table, D extends DataClass>
   /// ```
   /// (db.select(db.users)
   ///    ..orderBy([
-  ///      (u) => OrderingTerm(expression: u.isAwesome, mode: OrderingMode.desc),
+  ///      (u) =>
+  ///        OrderingTerm(expression: u.isAwesome, mode: OrderingMode.desc),
   ///      (u) => OrderingTerm(expression: u.id)
   ///    ]))
   ///  .get()

moor/lib/src/runtime/query_builder/statements/select/select_with_join.dart

@@ -94,7 +94,7 @@ class JoinedSelectStatement<FirstT extends Table, FirstD extends DataClass>
   /// .join([
   ///   leftOuterJoin(categories, categories.id.equalsExp(todos.category)),
   /// ])
-  /// ..where(and(todos.name.like("%Important"), categories.name.equals("Work")));
+  /// ..where(todos.name.like("%Important") & categories.name.equals("Work"));
   /// ```
   void where(Expression<bool, BoolType> predicate) {
     if (whereExpr == null) {
@@ -156,7 +156,7 @@ class JoinedSelectStatement<FirstT extends Table, FirstD extends DataClass>
         return await e.runSelect(ctx.sql, ctx.boundVariables);
       } catch (e, s) {
         final foundTables = <String>{};
-        for (var table in _tables) {
+        for (final table in _tables) {
           if (!foundTables.add(table.$tableName)) {
             _warnAboutDuplicate(e, s, table);
           }

moor/lib/src/runtime/query_builder/statements/update.dart

@@ -120,7 +120,7 @@ class UpdateStatement<T extends Table, D extends DataClass> extends Query<T, D>
 
     // entityToSql doesn't include absent values, so we might have to apply the
     // default value here
-    for (var column in table.$columns) {
+    for (final column in table.$columns) {
       // if a default value exists and no value is set, apply the default
       if (column.defaultValue != null &&
           !_updatedFields.containsKey(column.$name)) {

moor/lib/src/runtime/types/sql_types.dart

@@ -42,7 +42,7 @@ class BoolType extends SqlType<bool> {
   const BoolType();
 
   @override
-  bool mapFromDatabaseResponse(response) {
+  bool mapFromDatabaseResponse(dynamic response) {
     // ignore: avoid_returning_null
     if (response == null) return null;
     return response != 0;
@@ -57,7 +57,7 @@ class BoolType extends SqlType<bool> {
   }
 
   @override
-  mapToSqlVariable(bool content) {
+  dynamic mapToSqlVariable(bool content) {
     if (content == null) {
       return null;
     }
@@ -71,7 +71,7 @@ class StringType extends SqlType<String> implements Monoid<String> {
   const StringType();
 
   @override
-  String mapFromDatabaseResponse(response) => response?.toString();
+  String mapFromDatabaseResponse(dynamic response) => response?.toString();
 
   @override
   String mapToSqlConstant(String content) {
@@ -85,7 +85,7 @@ class StringType extends SqlType<String> implements Monoid<String> {
   }
 
   @override
-  mapToSqlVariable(String content) => content;
+  dynamic mapToSqlVariable(String content) => content;
 }
 
 /// Maps [int] values from and to sql
@@ -94,13 +94,13 @@ class IntType extends SqlType<int> implements FullArithmetic<int> {
   const IntType();
 
   @override
-  int mapFromDatabaseResponse(response) => response as int;
+  int mapFromDatabaseResponse(dynamic response) => response as int;
 
   @override
   String mapToSqlConstant(int content) => content?.toString() ?? 'NULL';
 
   @override
-  mapToSqlVariable(int content) {
+  dynamic mapToSqlVariable(int content) {
     return content;
   }
 }
@@ -112,7 +112,7 @@ class DateTimeType extends SqlType<DateTime>
   const DateTimeType();
 
   @override
-  DateTime mapFromDatabaseResponse(response) {
+  DateTime mapFromDatabaseResponse(dynamic response) {
     if (response == null) return null;
 
     final unixSeconds = response as int;
@@ -128,7 +128,7 @@ class DateTimeType extends SqlType<DateTime>
   }
 
   @override
-  mapToSqlVariable(DateTime content) {
+  dynamic mapToSqlVariable(DateTime content) {
     if (content == null) return null;
 
     return content.millisecondsSinceEpoch ~/ 1000;
@@ -141,7 +141,7 @@ class BlobType extends SqlType<Uint8List> {
   const BlobType();
 
   @override
-  mapFromDatabaseResponse(response) => response as Uint8List;
+  Uint8List mapFromDatabaseResponse(dynamic response) => response as Uint8List;
 
   @override
   String mapToSqlConstant(Uint8List content) {
@@ -151,7 +151,7 @@ class BlobType extends SqlType<Uint8List> {
   }
 
   @override
-  mapToSqlVariable(Uint8List content) => content;
+  dynamic mapToSqlVariable(Uint8List content) => content;
 }
 
 /// Maps [double] values from and to sql
@@ -160,7 +160,9 @@ class RealType extends SqlType<double> implements FullArithmetic<double> {
   const RealType();
 
   @override
-  double mapFromDatabaseResponse(response) => (response as num)?.toDouble();
+  double mapFromDatabaseResponse(dynamic response) {
+    return (response as num)?.toDouble();
+  }
 
   @override
   String mapToSqlConstant(num content) {
@@ -171,5 +173,5 @@ class RealType extends SqlType<double> implements FullArithmetic<double> {
   }
 
   @override
-  mapToSqlVariable(num content) => content;
+  dynamic mapToSqlVariable(num content) => content;
 }

moor/lib/src/utils/start_with_value_transformer.dart

@@ -29,10 +29,10 @@ class _StartWithValueStream<T> extends Stream<T> {
   StreamSubscription<T> listen(void Function(T event) onData,
       {Function onError, void Function() onDone, bool cancelOnError}) {
     var didReceiveData = false;
-    final wrappedCallback = (T event) {
+    void wrappedCallback(T event) {
       didReceiveData = true;
       onData?.call(event);
-    };
+    }
 
     final subscription = _inner.listen(wrappedCallback,
         onError: onError, onDone: onDone, cancelOnError: cancelOnError);

moor/lib/src/web/binary_string_conversion.dart

@@ -36,7 +36,7 @@ class _Bin2String extends Converter<Uint8List, String> {
 
   // There is a browser limit on the amount of chars one can give to
   // String.fromCharCodes https://github.com/kripken/sql.js/wiki/Persisting-a-Modified-Database#save-a-database-to-a-string
-  final int _chunkSize = 0xffff;
+  static const int _chunkSize = 0xffff;
 
   @override
   String convert(Uint8List input) {

moor/lib/src/web/web_db.dart

@@ -53,10 +53,10 @@ class _WebDelegate extends DatabaseDelegate {
 
   @override
   Future<void> runBatched(List<BatchedStatement> statements) {
-    for (var stmt in statements) {
+    for (final stmt in statements) {
       final prepared = _db.prepare(stmt.sql);
 
-      for (var args in stmt.variables) {
+      for (final args in stmt.variables) {
         prepared
           ..executeWith(args)
           ..step();

moor/test/custom_queries_test.dart

@@ -4,6 +4,8 @@ import 'package:test/test.dart';
 import 'data/tables/todos.dart';
 import 'data/utils/mocks.dart';
 
+// ignore_for_file: lines_longer_than_80_chars
+
 void main() {
   TodoDb db;
   MockExecutor executor;

moor/test/data/utils/mocks.dart

@@ -6,7 +6,7 @@ import 'package:moor/src/runtime/executor/stream_queries.dart';
 
 export 'package:mockito/mockito.dart';
 
-typedef Future<T> _EnsureOpenAction<T>(QueryExecutor e);
+typedef _EnsureOpenAction<T> = Future<T> Function(QueryExecutor e);
 
 class MockExecutor extends Mock implements QueryExecutor {
   final MockTransactionExecutor transactions = MockTransactionExecutor();
@@ -31,7 +31,7 @@ class MockExecutor extends Mock implements QueryExecutor {
     });
     when(runCustom(any, any)).thenAnswer((_) {
       assert(_opened);
-      return Future.value(0);
+      return Future.value();
     });
     when(beginTransaction()).thenAnswer((_) {
       assert(_opened);

moor/test/error_handling_test.dart

@@ -10,9 +10,9 @@ const nullContent =
     TodosTableCompanion(title: Value('Test'), content: Value(null));
 const absentContent =
     TodosTableCompanion(title: Value('Test'), content: Value.absent());
-final shortTitle =
+const shortTitle =
-    const TodosTableCompanion(title: Value('A'), content: Value('content'));
+    TodosTableCompanion(title: Value('A'), content: Value('content'));
-final longTitle = TodosTableCompanion(
+final TodosTableCompanion longTitle = TodosTableCompanion(
     title: Value('A ${'very' * 5} long title'), content: const Value('hi'));
 const valid =
     TodosTableCompanion(title: Value('Test'), content: Value('Some content'));

moor/test/expressions/constant_test.dart

@@ -23,7 +23,7 @@ void main() {
     // these shouldn't be identical, so no const constructor
     final first = Constant('hi'); // ignore: prefer_const_constructors
     final alsoFirst = Constant('hi'); // ignore: prefer_const_constructors
-    final second = const Constant(3);
+    const second = Constant(3);
 
     expectEquals(first, alsoFirst);
     expectNotEquals(first, second);

moor/test/expressions/datetime_expression_test.dart

@@ -5,7 +5,7 @@ import '../data/utils/expect_equality.dart';
 
 // ignore_for_file: deprecated_member_use_from_same_package
 
-typedef Expression<int, IntType> _Extractor(
+typedef _Extractor = Expression<int, IntType> Function(
     Expression<DateTime, DateTimeType> d);
 
 /// Tests the top level [year], [month], ..., [second] methods

moor/test/insert_test.dart

@@ -79,8 +79,8 @@ void main() {
       TodosTableCompanion(title: Value('title'), content: Value('c')),
     ]);
 
-    final insertSimple = 'INSERT INTO todos (content) VALUES (?)';
+    const insertSimple = 'INSERT INTO todos (content) VALUES (?)';
-    final insertTitle = 'INSERT INTO todos (title, content) VALUES (?, ?)';
+    const insertTitle = 'INSERT INTO todos (title, content) VALUES (?, ?)';
 
     verify(executor.runBatched([
       BatchedStatement(insertSimple, [
@@ -103,8 +103,8 @@ void main() {
       TodosTableCompanion(title: Value('title'), content: Value('c')),
     ], orReplace: true);
 
-    final insertSimple = 'INSERT OR REPLACE INTO todos (content) VALUES (?)';
+    const insertSimple = 'INSERT OR REPLACE INTO todos (content) VALUES (?)';
-    final insertTitle =
+    const insertTitle =
         'INSERT OR REPLACE INTO todos (title, content) VALUES (?, ?)';
 
     verify(executor.runBatched([

moor/test/join_test.dart

@@ -21,8 +21,8 @@ void main() {
     ]).get();
 
     verify(executor.runSelect(
-        'SELECT t.id AS "t.id", t.title AS "t.title", t.content AS "t.content", '
+        'SELECT t.id AS "t.id", t.title AS "t.title", '
-        't.target_date AS "t.target_date", '
+        't.content AS "t.content", t.target_date AS "t.target_date", '
         't.category AS "t.category", c.id AS "c.id", c.`desc` AS "c.desc" '
         'FROM todos t LEFT OUTER JOIN categories c ON c.id = t.category;',
         argThat(isEmpty)));

moor/test/parsed_sql/moor_files_integration_test.dart

@@ -65,7 +65,8 @@ void main() {
         OrderBy([OrderingTerm(expression: db.config.configKey)])).get();
 
     verify(mock.runSelect(
-      'SELECT * FROM config WHERE config_key IN (?1, ?2) ORDER BY config_key ASC',
+      'SELECT * FROM config WHERE config_key IN (?1, ?2) '
+      'ORDER BY config_key ASC',
       ['a', 'b'],
     ));
   });

moor/test/schema_test.dart

@@ -88,7 +88,8 @@ void main() {
           .addColumn(db.users, db.users.isAwesome);
 
       verify(mockQueryExecutor.call('ALTER TABLE users ADD COLUMN '
-          'is_awesome INTEGER NOT NULL DEFAULT 1 CHECK (is_awesome in (0, 1));'));
+          'is_awesome INTEGER NOT NULL DEFAULT 1 '
+          'CHECK (is_awesome in (0, 1));'));
     });
   });
 

moor/test/serialization_test.dart

@@ -3,9 +3,9 @@ import 'package:moor/src/runtime/data_class.dart';
 import 'package:test/test.dart';
 import 'data/tables/todos.dart';
 
-final someDate = DateTime(2019, 06, 08);
+final DateTime someDate = DateTime(2019, 06, 08);
 
-final someTodoEntry = TodoEntry(
+final TodoEntry someTodoEntry = TodoEntry(
   id: 3,
   title: 'a title',
   content: null,
@@ -13,7 +13,7 @@ final someTodoEntry = TodoEntry(
   category: 3,
 );
 
-final regularSerialized = {
+final Map<String, dynamic> regularSerialized = {
   'id': 3,
   'title': 'a title',
   'content': null,
@@ -21,7 +21,7 @@ final regularSerialized = {
   'category': 3,
 };
 
-final customSerialized = {
+final Map<String, dynamic> customSerialized = {
   'id': 3,
   'title': 'a title',
   'content': 'set to null',
@@ -31,7 +31,7 @@ final customSerialized = {
 
 class CustomSerializer extends ValueSerializer {
   @override
-  T fromJson<T>(json) {
+  T fromJson<T>(dynamic json) {
     if (T == DateTime) {
       return DateTime.parse(json.toString()) as T;
     } else if (json == 'set to null') {
@@ -42,7 +42,7 @@ class CustomSerializer extends ValueSerializer {
   }
 
   @override
-  toJson<T>(T value) {
+  dynamic toJson<T>(T value) {
     if (T == DateTime) {
       return (value as DateTime).toIso8601String();
     } else if (value == null) {
@@ -55,7 +55,7 @@ class CustomSerializer extends ValueSerializer {
 
 void main() {
   test('default serializer', () {
-    final serializer = const ValueSerializer.defaults();
+    const serializer = ValueSerializer.defaults();
     expect(serializer.toJson<DateTime>(null), null);
     expect(serializer.fromJson<DateTime>(null), null);
   });

moor/test/streams_test.dart

@@ -50,12 +50,12 @@ void main() {
   test('streams emit cached data when a new listener attaches', () async {
     when(executor.runSelect(any, any)).thenAnswer((_) => Future.value([]));
 
-    final first = (db.select(db.users).watch());
+    final first = db.select(db.users).watch();
     expect(first, emits(isEmpty));
 
     clearInteractions(executor);
 
-    final second = (db.select(db.users).watch());
+    final second = db.select(db.users).watch();
     expect(second, emits(isEmpty));
 
     // calling executor.dialect is ok, it's needed to construct the statement

moor/test/transactions_test.dart

@@ -1,5 +1,7 @@
 @TestOn('!browser') // todo: Figure out why this doesn't run in js
 
+// ignore_for_file: lines_longer_than_80_chars
+
 /*
 These tests don't work when compiled to js:
 

moor/test/types/datetime_test.dart

@@ -7,7 +7,7 @@ final _exampleDateTime =
     DateTime.fromMillisecondsSinceEpoch(_exampleUnixMillis);
 
 void main() {
-  final type = const moor.DateTimeType();
+  const type = moor.DateTimeType();
 
   group('DateTimes', () {
     test('can be read from unix stamps returned by sql', () {

moor/test/types/real_type_test.dart

@@ -2,7 +2,7 @@ import 'package:moor/moor.dart' as moor;
 import 'package:test/test.dart';
 
 void main() {
-  final type = const moor.RealType();
+  const type = moor.RealType();
 
   group('RealType', () {
     test('can be read from floating point values returned by sql', () {

moor/test/types/sql_type_test.dart

@@ -5,7 +5,7 @@ void main() {
   test('types map null values to null', () {
     const typeSystem = SqlTypeSystem.defaultInstance;
 
-    for (var type in typeSystem.types) {
+    for (final type in typeSystem.types) {
       expect(type.mapToSqlVariable(null), isNull,
           reason: '$type should map null to null variables');
       expect(type.mapFromDatabaseResponse(null), isNull,

moor/test/utils/single_transformer_test.dart

@@ -11,6 +11,7 @@ void main() {
     expectLater(stream, emitsInOrder([1, 2, 3, 4]));
 
     controller..add([1])..add([2])..add([3])..add([4]);
+    controller.close();
   });
 
   test('emits errors for invalid lists', () {
@@ -20,5 +21,6 @@ void main() {
     expectLater(stream, emitsInOrder([1, emitsError(anything), 2, null]));
 
     controller..add([1])..add([2, 3])..add([2])..add([]);
+    controller.close();
   });
 }

moor/tools/analyzer_plugin/bin/plugin.dart

@@ -24,7 +24,7 @@ class _PluginProxy {
 
   _PluginProxy(this.sendToAnalysisServer);
 
-  void start() async {
+  Future<void> start() async {
     _channel = IOWebSocketChannel.connect('ws://localhost:9999');
     _receive = ReceivePort();
     sendToAnalysisServer.send(_receive.sendPort);

moor_ffi/example/main.dart

@@ -18,7 +18,7 @@ void main() {
 
   final selectStmt = db.prepare('SELECT * FROM frameworks ORDER BY name');
   final result = selectStmt.select();
-  for (var row in result) {
+  for (final row in result) {
     print('${row['id']}: ${row['name']}');
   }
 

moor_ffi/lib/src/api/result.dart

@@ -34,7 +34,7 @@ class Row extends MapMixin<String, dynamic>
   }
 
   @override
-  operator [](Object key) {
+  dynamic operator [](Object key) {
     if (key is! String) return null;
 
     final index = _result._calculatedIndexes[key];

moor_ffi/lib/src/impl/database.dart

@@ -63,7 +63,7 @@ class Database {
   void close() {
     // close all prepared statements first
     _isClosed = true;
-    for (var stmt in _preparedStmt) {
+    for (final stmt in _preparedStmt) {
       stmt.close();
     }
 

moor_ffi/lib/src/impl/prepared_statement.dart

@@ -91,7 +91,7 @@ class PreparedStatement {
       bindings.sqlite3_reset(_stmt);
       _bound = false;
     }
-    for (var pointer in _allocatedWhileBinding) {
+    for (final pointer in _allocatedWhileBinding) {
       pointer.free();
     }
     _allocatedWhileBinding.clear();

moor_ffi/lib/src/load_library.dart

@@ -24,8 +24,8 @@ DynamicLibrary _defaultOpen() {
     return DynamicLibrary.open('libsqlite3.so');
   }
   if (Platform.isMacOS || Platform.isIOS) {
-    // todo when we use a dev version of Dart 2.6, we can (and should!!) use DynamicLibrary.executable() here
+    // todo: Consider including sqlite3 in the build and use DynamicLibrary.
-//     return DynamicLibrary.executable();
+    // executable()
     return DynamicLibrary.open('/usr/lib/libsqlite3.dylib');
   }
   if (Platform.isWindows) {

moor_ffi/lib/src/vm_database.dart

@@ -46,12 +46,9 @@ class _VmDelegate extends DatabaseDelegate {
 
   @override
   Future<void> runBatched(List<BatchedStatement> statements) async {
-    for (var stmt in statements) {
+    for (final stmt in statements) {
       final prepared = _db.prepare(stmt.sql);
-
+      stmt.variables.forEach(prepared.execute);
-      for (var boundVars in stmt.variables) {
-        prepared.execute(boundVars);
-      }
 
       prepared.close();
     }

moor_ffi/test/ffi/blob_test.dart

@@ -5,7 +5,7 @@ import 'package:test/test.dart';
 
 void main() {
   test('utf8 store and load test', () {
-    final content = 'Hasta Mañana';
+    const content = 'Hasta Mañana';
     final blob = CBlob.allocateString(content);
 
     expect(blob.readString(), content);

moor_flutter/example/lib/bloc.dart

@@ -53,7 +53,7 @@ class TodoAppBloc {
     _activeCategory.add(category);
   }
 
-  void addCategory(String description) async {
+  Future<void> addCategory(String description) async {
     final id = await db.createCategory(description);
 
     showCategory(Category(id: id, description: description));
@@ -83,4 +83,9 @@ class TodoAppBloc {
 
     db.deleteCategory(category);
   }
+
+  void close() {
+    db.close();
+    _allCategories.close();
+  }
 }

moor_flutter/example/lib/main.dart

@@ -8,8 +8,9 @@ void main() => runApp(MyApp());
 class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    return Provider(
+    return Provider<TodoAppBloc>(
       create: (_) => TodoAppBloc(),
+      dispose: (_, bloc) => bloc.close(),
       child: MaterialApp(
         title: 'moor Demo',
         theme: ThemeData(

moor_flutter/example/lib/widgets/add_category_dialog.dart

@@ -14,12 +14,12 @@ class _AddCategoryDialogState extends State<AddCategoryDialog> {
   Widget build(BuildContext context) {
     return Dialog(
       child: Padding(
-        padding: const EdgeInsets.all(8.0),
+        padding: const EdgeInsets.all(8),
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [
             Padding(
-              padding: const EdgeInsets.all(8.0),
+              padding: const EdgeInsets.all(8),
               child: Text(
                 'Add a category',
                 style: Theme.of(context).textTheme.title,

moor_flutter/example/lib/widgets/categories_drawer.dart

@@ -81,7 +81,7 @@ class _CategoryDrawerEntry extends StatelessWidget {
         ),
       ),
       Padding(
-        padding: const EdgeInsets.all(8.0),
+        padding: const EdgeInsets.all(8),
         child: Text('${entry.categoryWithCount?.count} entries'),
       ),
     ];
@@ -129,7 +129,7 @@ class _CategoryDrawerEntry extends StatelessWidget {
     }
 
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 8.0),
+      padding: const EdgeInsets.symmetric(horizontal: 8),
       child: Material(
         color: isActive
             ? Colors.orangeAccent.withOpacity(0.3)
@@ -141,7 +141,7 @@ class _CategoryDrawerEntry extends StatelessWidget {
             Navigator.pop(context); // close the navigation drawer
           },
           child: Padding(
-            padding: const EdgeInsets.all(8.0),
+            padding: const EdgeInsets.all(8),
             child: Row(
               children: rowContent,
             ),

moor_flutter/example/lib/widgets/homescreen.dart

@@ -17,7 +17,8 @@ class HomeScreen extends StatefulWidget {
 
 /// Shows a list of todos and displays a text input to add another one
 class HomeScreenState extends State<HomeScreen> {
-  // we only use this to reset the input field at the bottom when a entry has been added
+  // we only use this to reset the input field at the bottom when a entry has
+  // been added
   final TextEditingController controller = TextEditingController();
 
   TodoAppBloc get bloc => Provider.of<TodoAppBloc>(context);
@@ -29,8 +30,6 @@ class HomeScreenState extends State<HomeScreen> {
         title: Text('Todo list'),
       ),
       drawer: CategoriesDrawer(),
-      // A moorAnimatedList automatically animates incoming and leaving items, we only
-      // have to tell it what data to display and how to turn data into widgets.
       body: StreamBuilder<List<EntryWithCategory>>(
         stream: bloc.homeScreenEntries,
         builder: (context, snapshot) {
@@ -52,10 +51,10 @@ class HomeScreenState extends State<HomeScreen> {
         },
       ),
       bottomSheet: Material(
-        elevation: 12.0,
+        elevation: 12,
         child: SafeArea(
           child: Padding(
-            padding: const EdgeInsets.all(8.0),
+            padding: const EdgeInsets.all(8),
             child: f.Column(
               mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.start,

moor_flutter/example/lib/widgets/todo_card.dart

@@ -35,7 +35,7 @@ class TodoCard extends StatelessWidget {
 
     return Card(
       child: Padding(
-        padding: const EdgeInsets.all(8.0),
+        padding: const EdgeInsets.all(8),
         child: Row(
           mainAxisSize: MainAxisSize.max,
           children: <Widget>[
@@ -64,8 +64,9 @@ class TodoCard extends StatelessWidget {
               icon: const Icon(Icons.delete),
               color: Colors.red,
               onPressed: () {
-                // We delete the entry here. Again, notice how we don't have to call setState() or
+                // We delete the entry here. Again, notice how we don't have to
-                // inform the parent widget. The animated list will take care of this automatically.
+                // call setState() or inform the parent widget. Moor will take
+                // care of updating the underlying data automatically
                 Provider.of<TodoAppBloc>(context).deleteEntry(entry);
               },
             )

moor_flutter/lib/moor_flutter.dart

@@ -115,8 +115,8 @@ mixin _SqfliteExecutor on QueryDelegate {
   Future<void> runBatched(List<BatchedStatement> statements) async {
     final batch = db.batch();
 
-    for (var statement in statements) {
+    for (final statement in statements) {
-      for (var boundVariables in statement.variables) {
+      for (final boundVariables in statement.variables) {
         batch.execute(statement.sql, boundVariables);
       }
     }

moor_generator/lib/plugin.dart

@@ -29,7 +29,7 @@ class WebSocketPluginServer implements PluginCommunicationChannel {
     _init();
   }
 
-  void _init() async {
+  Future<void> _init() async {
     server = await HttpServer.bind(address, port);
     print('listening on $address at port $port');
     server.transform(WebSocketTransformer()).listen(_handleClientAdded);
@@ -37,8 +37,8 @@ class WebSocketPluginServer implements PluginCommunicationChannel {
 
   void _handleClientAdded(WebSocket socket) {
     if (_currentClient != null) {
-      print(
+      print('ignoring connection attempt because an active client already '
-          'ignoring connection attempt because an active client already exists');
+          'exists');
       socket.close();
     } else {
       print('client connected');

moor_generator/lib/src/analyzer/dart/column_parser.dart

@@ -27,7 +27,8 @@ const String _methodMap = 'map';
 
 const String _errorMessage = 'This getter does not create a valid column that '
     'can be parsed by moor. Please refer to the readme from moor to see how '
-    'columns are formed. If you have any questions, feel free to raise an issue.';
+    'columns are formed. If you have any questions, feel free to raise an '
+    'issue.';
 
 /// Parses a single column defined in a Dart table. These columns are a chain
 /// or [MethodInvocation]s. An example getter might look like this:
@@ -70,7 +71,7 @@ class ColumnParser {
 
     final foundFeatures = <ColumnFeature>[];
 
-    while (true) {
+    for (;;) {
       final methodName = remainingExpr.methodName.name;
 
       if (starters.contains(methodName)) {
@@ -158,7 +159,7 @@ class ColumnParser {
       }
 
       // We're not at a starting method yet, so we need to go deeper!
-      final inner = (remainingExpr.target) as MethodInvocation;
+      final inner = remainingExpr.target as MethodInvocation;
       remainingExpr = inner;
     }
 

moor_generator/lib/src/analyzer/dart/parser.dart

@@ -49,8 +49,8 @@ class MoorDartParser {
       step.reportError(ErrorInDartCode(
         affectedElement: method.declaredElement,
         severity: Severity.criticalError,
-        message:
+        message: 'This method must have an expression body '
-            'This method must have an expression body (user => instead of {return ...})',
+            '(use => instead of {return ...})',
       ));
       return null;
     }
@@ -66,7 +66,7 @@ class MoorDartParser {
     return resolvedLibrary.getElementDeclaration(element);
   }
 
-  String readStringLiteral(Expression expression, void onError()) {
+  String readStringLiteral(Expression expression, void Function() onError) {
     if (!(expression is StringLiteral)) {
       onError();
     } else {
@@ -81,7 +81,7 @@ class MoorDartParser {
     return null;
   }
 
-  int readIntLiteral(Expression expression, void onError()) {
+  int readIntLiteral(Expression expression, void Function() onError) {
     if (!(expression is IntegerLiteral)) {
       onError();
       // ignore: avoid_returning_null

moor_generator/lib/src/analyzer/dart/table_parser.dart

@@ -22,7 +22,7 @@ class TableParser {
     table.declaration = TableDeclaration(table, base.step.file, element, null);
 
     var index = 0;
-    for (var converter in table.converters) {
+    for (final converter in table.converters) {
       converter
         ..index = index++
         ..table = table;
@@ -91,7 +91,7 @@ class TableParser {
     final parsedPrimaryKey = <SpecifiedColumn>{};
 
     if (expression is SetOrMapLiteral) {
-      for (var entry in expression.elements) {
+      for (final entry in expression.elements) {
         if (entry is Identifier) {
           final column = columns
               .singleWhere((column) => column.dartGetterName == entry.name);

moor_generator/lib/src/analyzer/moor/create_table_reader.dart

@@ -22,7 +22,7 @@ class CreateTableReader {
     final foundColumns = <String, SpecifiedColumn>{};
     final primaryKey = <SpecifiedColumn>{};
 
-    for (var column in table.resolvedColumns) {
+    for (final column in table.resolvedColumns) {
       var isPrimaryKey = false;
       final features = <ColumnFeature>[];
       final sqlName = column.name;
@@ -33,7 +33,7 @@ class CreateTableReader {
       String defaultValue;
       String overriddenJsonKey;
 
-      for (var constraint in column.constraints) {
+      for (final constraint in column.constraints) {
         if (constraint is PrimaryKeyColumn) {
           isPrimaryKey = true;
           features.add(const PrimaryKey());
@@ -95,7 +95,7 @@ class CreateTableReader {
 
     final constraints = table.tableConstraints.map((c) => c.span.text).toList();
 
-    for (var keyConstraint in table.tableConstraints.whereType<KeyClause>()) {
+    for (final keyConstraint in table.tableConstraints.whereType<KeyClause>()) {
       if (keyConstraint.isPrimaryKey) {
         primaryKey.addAll(keyConstraint.indexedColumns
             .map((r) => foundColumns[r.columnName])

moor_generator/lib/src/analyzer/moor/inline_dart_resolver.dart

@@ -34,7 +34,7 @@ class InlineDartResolver {
     final fakeDart = StringBuffer();
 
     fakeDart.write("import 'package:moor/moor.dart';\n");
-    for (var import in importStatements) {
+    for (final import in importStatements) {
       fakeDart.write("import '$import';\n");
     }
 

moor_generator/lib/src/analyzer/moor/parser.dart

@@ -20,7 +20,7 @@ class MoorParser {
     final queryDeclarations = <DeclaredMoorQuery>[];
     final importStatements = <ImportStatement>[];
 
-    for (var parsedStmt in parsedFile.statements) {
+    for (final parsedStmt in parsedFile.statements) {
       if (parsedStmt is ImportStatement) {
         final importStmt = parsedStmt;
         step.inlineDartResolver.importStatements.add(importStmt.importedFile);
@@ -32,7 +32,7 @@ class MoorParser {
       }
     }
 
-    for (var error in result.errors) {
+    for (final error in result.errors) {
       step.reportError(ErrorInMoorFile(
         severity: Severity.error,
         span: error.token.span,
@@ -42,7 +42,7 @@ class MoorParser {
 
     final createdTables = <SpecifiedTable>[];
     final tableDeclarations = <CreateTableStatement, SpecifiedTable>{};
-    for (var reader in createdReaders) {
+    for (final reader in createdReaders) {
       final table = reader.extractTable(step.mapper);
       createdTables.add(table);
       tableDeclarations[reader.stmt] = table;
@@ -55,7 +55,7 @@ class MoorParser {
       imports: importStatements,
       tableDeclarations: tableDeclarations,
     );
-    for (var decl in queryDeclarations) {
+    for (final decl in queryDeclarations) {
       decl.file = analyzedFile;
     }
 

moor_generator/lib/src/analyzer/moor/table_handler.dart

@@ -15,7 +15,7 @@ class TableHandler {
   TableHandler(this.step, this.file, this.availableTables);
 
   void handle() {
-    for (var table in file.declaredTables) {
+    for (final table in file.declaredTables) {
       table.references.clear();
     }
 

moor_generator/lib/src/analyzer/runner/file_graph.dart

@@ -43,7 +43,7 @@ class FileGraph {
       final neighbors = edges[file];
 
       if (neighbors != null) {
-        for (var neighbor in neighbors) {
+        for (final neighbor in neighbors) {
           // if the neighbor wasn't in the set, also add to unhandled nodes so
           // that we crawl its imports later.
           if (found.add(neighbor)) {
@@ -62,7 +62,7 @@ class FileGraph {
     // clear old imports, we also need to take the transposed imports into
     // account here
     if (_imports.containsKey(file)) {
-      for (var oldImport in _imports[file]) {
+      for (final oldImport in _imports[file]) {
         _transposedImports[oldImport]?.remove(file);
       }
       _imports.remove(file);
@@ -70,7 +70,7 @@ class FileGraph {
 
     _imports[file] = updatedImports;
 
-    for (var newImport in updatedImports) {
+    for (final newImport in updatedImports) {
       _transposedImports.putIfAbsent(newImport, () => []).add(file);
     }
   }
@@ -112,7 +112,7 @@ class FoundFile {
   int get hashCode => uri.hashCode;
 
   @override
-  bool operator ==(other) {
+  bool operator ==(dynamic other) {
     return identical(this, other) || other is FoundFile && other.uri == uri;
   }
 }

moor_generator/lib/src/analyzer/runner/steps/analyze_dart.dart

@@ -7,7 +7,7 @@ class AnalyzeDartStep extends AnalyzingStep {
   void analyze() {
     final parseResult = file.currentResult as ParsedDartFile;
 
-    for (var accessor in parseResult.dbAccessors) {
+    for (final accessor in parseResult.dbAccessors) {
       final transitiveImports = _transitiveImports(accessor.resolvedImports);
 
       var availableTables = _availableTables(transitiveImports)

moor_generator/lib/src/analyzer/runner/steps/parse_dart.dart

@@ -27,7 +27,7 @@ class ParseDartStep extends Step {
     final databases = <SpecifiedDatabase>[];
     final daos = <SpecifiedDao>[];
 
-    for (var declaredClass in reader.classes) {
+    for (final declaredClass in reader.classes) {
       // check if the table inherits from the moor table class. The !isExactly
       // check is here because we run this generator on moor itself and we get
       // weird errors for the Table class itself.
@@ -35,12 +35,12 @@ class ParseDartStep extends Step {
           !_tableTypeChecker.isExactly(declaredClass)) {
         await _parseTable(declaredClass);
       } else {
-        for (var annotation in _useMoorChecker.annotationsOf(declaredClass)) {
+        for (final annotation in _useMoorChecker.annotationsOf(declaredClass)) {
           final reader = ConstantReader(annotation);
           databases.add(await parseDatabase(declaredClass, reader));
         }
 
-        for (var annotation in _useDaoChecker.annotationsOf(declaredClass)) {
+        for (final annotation in _useDaoChecker.annotationsOf(declaredClass)) {
           final reader = ConstantReader(annotation);
           daos.add(await parseDao(declaredClass, reader));
         }
@@ -90,7 +90,7 @@ class ParseDartStep extends Step {
           message: 'The type $type is not a moor table',
           affectedElement: initializedBy,
         ));
-        return null;
+        return Future.value(null);
       } else {
         return _parseTable(type.element as ClassElement);
       }

moor_generator/lib/src/analyzer/runner/task.dart

@@ -55,7 +55,7 @@ class Task {
     final moorFiles = _analyzedFiles.where((f) => f.type == FileType.moor);
     final otherFiles = _analyzedFiles.where((f) => f.type != FileType.moor);
 
-    for (var file in moorFiles.followedBy(otherFiles)) {
+    for (final file in moorFiles.followedBy(otherFiles)) {
       file.errors.clearNonParsingErrors();
       await _analyze(file);
     }
@@ -82,7 +82,7 @@ class Task {
         file.currentResult = parsed;
 
         parsed.resolvedImports = <ImportStatement, FoundFile>{};
-        for (var import in parsed.imports) {
+        for (final import in parsed.imports) {
           if (import.importedFile == null) {
             // invalid import statement, this can happen as the user is typing
             continue;
@@ -112,10 +112,10 @@ class Task {
             .cast<SpecifiedDbAccessor>()
             .followedBy(parsed.declaredDatabases);
 
-        for (var accessor in daosAndDatabases) {
+        for (final accessor in daosAndDatabases) {
           final resolvedForAccessor = <FoundFile>[];
 
-          for (var import in accessor.includes) {
+          for (final import in accessor.includes) {
             final found = session.resolve(file, import);
             if (!await backend.exists(found.uri)) {
               step.reportError(ErrorInDartCode(
@@ -165,7 +165,7 @@ class Task {
             (available.currentResult as ParsedMoorFile).resolvedImports.values;
       }
 
-      for (var next in importsFromHere) {
+      for (final next in importsFromHere) {
         if (!found.contains(next) && !unhandled.contains(next)) {
           unhandled.add(next);
         }
@@ -197,7 +197,7 @@ class Task {
   }
 
   void _notifyFilesNeedWork(Iterable<FoundFile> files) {
-    for (var file in files) {
+    for (final file in files) {
       if (!_analyzedFiles.contains(file) && !_unhandled.contains(file)) {
         _unhandled.add(file);
       }
@@ -212,7 +212,7 @@ class Task {
       log.warning('There were some errors while running moor_generator on '
           '${backend.entrypoint}:');
 
-      for (var error in foundErrors) {
+      for (final error in foundErrors) {
         final printer = error.isError ? log.warning : log.info;
         error.writeDescription(printer);
       }

moor_generator/lib/src/analyzer/session.dart

@@ -75,7 +75,7 @@ class MoorSession {
 
     // all files that transitively imported this files are no longer analyzed
     // because they depend on this file. They're still parsed though
-    for (var affected in fileGraph.crawl(file, transposed: true)) {
+    for (final affected in fileGraph.crawl(file, transposed: true)) {
       if (affected.state == FileState.analyzed) {
         affected.state = FileState.parsed;
       }

moor_generator/lib/src/analyzer/sql_queries/lints/linter.dart

@@ -61,7 +61,7 @@ class _LintingVisitor extends RecursiveVisitor<void> {
     // First, check that the amount of values matches the declaration.
     e.source.when(
       isValues: (values) {
-        for (var tuple in values.values) {
+        for (final tuple in values.values) {
           if (tuple.expressions.length != targeted.length) {
             linter.lints.add(AnalysisError(
               type: AnalysisErrorType.other,

moor_generator/lib/src/analyzer/sql_queries/query_handler.dart

@@ -46,8 +46,8 @@ class QueryHandler {
         root is InsertStatement) {
       return _handleUpdate();
     } else {
-      throw StateError(
+      throw StateError('Unexpected sql: Got $root, expected insert, select, '
-          'Unexpected sql: Got $root, expected insert, select, update or delete');
+          'update or delete');
     }
   }
 
@@ -79,7 +79,7 @@ class QueryHandler {
     final columns = <ResultColumn>[];
     final rawColumns = _select.resolvedColumns;
 
-    for (var column in rawColumns) {
+    for (final column in rawColumns) {
       final type = context.typeOf(column).type;
       final moorType = mapper.resolvedToMoor(type);
       UsedTypeConverter converter;
@@ -111,7 +111,7 @@ class QueryHandler {
       var matches = true;
 
       // go trough all columns of the table in question
-      for (var column in moorTable.columns) {
+      for (final column in moorTable.columns) {
         // check if this column from the table is present in the result set
         final tableColumn = table.findColumn(column.name.name);
         final inResultSet =

moor_generator/lib/src/analyzer/sql_queries/sql_parser.dart

@@ -29,7 +29,7 @@ class SqlParser {
   void parse() {
     _spawnEngine();
 
-    for (var query in definedQueries) {
+    for (final query in definedQueries) {
       final name = query.name;
       var declaredInMoor = false;
 
@@ -51,7 +51,7 @@ class SqlParser {
         continue;
       }
 
-      for (var error in context.errors) {
+      for (final error in context.errors) {
         _report(error,
             msg: () => 'The sql query $name is invalid: $error',
             severity: Severity.error);
@@ -67,8 +67,8 @@ class SqlParser {
     }
 
     // report lints
-    for (var query in foundQueries) {
+    for (final query in foundQueries) {
-      for (var lint in query.lints) {
+      for (final lint in query.lints) {
         _report(lint,
             msg: () => 'Lint for ${query.name}: $lint',
             severity: Severity.warning);

moor_generator/lib/src/analyzer/sql_queries/type_mapping.dart

@@ -15,7 +15,7 @@ class TypeMapper {
   /// by the sqlparser library.
   Table extractStructure(SpecifiedTable table) {
     final columns = <TableColumn>[];
-    for (var specified in table.columns) {
+    for (final specified in table.columns) {
       final hint = specified.typeConverter != null
           ? TypeConverterHint(specified.typeConverter)
           : null;
@@ -111,7 +111,7 @@ class TypeMapper {
     var maxIndex = 999;
     var currentIndex = 0;
 
-    for (var used in merged) {
+    for (final used in merged) {
       if (used is Variable) {
         if (used.resolvedIndex == currentIndex) {
           continue; // already handled, we only report a single variable / index
@@ -127,8 +127,8 @@ class TypeMapper {
 
         if (explicitIndex != null && currentIndex >= maxIndex) {
           throw ArgumentError(
-              'Cannot have a variable with an index lower than that of an array '
+              'Cannot have a variable with an index lower than that of an '
-              'appearing after an array!');
+              'array appearing after an array!');
         }
 
         foundElements
@@ -158,14 +158,14 @@ class TypeMapper {
   List<dynamic /* Variable|DartPlaceholder */ > _mergeVarsAndPlaceholders(
       List<Variable> vars, List<DartPlaceholder> placeholders) {
     final groupVarsByIndex = <int, List<Variable>>{};
-    for (var variable in vars) {
+    for (final variable in vars) {
       groupVarsByIndex
           .putIfAbsent(variable.resolvedIndex, () => [])
           .add(variable);
     }
     // sort each group by index
-    for (var group in groupVarsByIndex.values) {
+    for (final group in groupVarsByIndex.values) {
-      group..sort((a, b) => a.resolvedIndex.compareTo(b.resolvedIndex));
+      group.sort((a, b) => a.resolvedIndex.compareTo(b.resolvedIndex));
     }
 
     int Function(dynamic, dynamic) comparer;

moor_generator/lib/src/backends/build/generators/dao_generator.dart

@@ -12,7 +12,7 @@ class DaoGenerator extends Generator implements BaseGenerator {
     final parsed = await builder.analyzeDartFile(buildStep);
     final writer = builder.createWriter();
 
-    for (var dao in parsed.declaredDaos) {
+    for (final dao in parsed.declaredDaos) {
       final classScope = writer.child();
       final element = dao.fromClass;
 
@@ -21,7 +21,7 @@ class DaoGenerator extends Generator implements BaseGenerator {
       classScope.leaf().write('mixin _\$${daoName}Mixin on '
           'DatabaseAccessor<${dao.dbClass.displayName}> {\n');
 
-      for (var table in dao.allTables) {
+      for (final table in dao.allTables) {
         final infoType = table.tableInfoName;
         final getterName = table.tableFieldName;
         classScope
@@ -30,7 +30,7 @@ class DaoGenerator extends Generator implements BaseGenerator {
       }
 
       final writtenMappingMethods = <String>{};
-      for (var query in dao.resolvedQueries) {
+      for (final query in dao.resolvedQueries) {
         QueryWriter(query, classScope.child(), writtenMappingMethods).write();
       }
 

moor_generator/lib/src/backends/build/generators/moor_generator.dart

@@ -29,7 +29,7 @@ class MoorGenerator extends Generator implements BaseGenerator {
       writer.leaf().write(ignore);
     }
 
-    for (var db in parsed.declaredDatabases) {
+    for (final db in parsed.declaredDatabases) {
       DatabaseWriter(db, writer.child()).write();
     }
 

moor_generator/lib/src/backends/build/moor_builder.dart

@@ -27,7 +27,7 @@ class MoorBuilder extends SharedPartBuilder {
 
     final builder = MoorBuilder._(generators, 'moor', parsedOptions);
 
-    for (var generator in generators.cast<BaseGenerator>()) {
+    for (final generator in generators.cast<BaseGenerator>()) {
       generator.builder = builder;
     }
 

moor_generator/lib/src/backends/plugin/backend/driver.dart

@@ -131,6 +131,7 @@ class MoorDriver implements AnalysisDriverGeneric {
   }
 
   @override
+  // ignore: avoid_setters_without_getters
   set priorityFiles(List<String> priorityPaths) {
     final found = priorityPaths.where(_ownsFile).map(pathToFoundFile);
     _tracker.setPriorityFiles(found);

moor_generator/lib/src/backends/plugin/backend/file_tracker.dart

@@ -57,7 +57,7 @@ class FileTracker {
 
   void setPriorityFiles(Iterable<FoundFile> priority) {
     // remove prioritized flag from existing files
-    for (var file in _currentPriority) {
+    for (final file in _currentPriority) {
       file._prioritized = false;
       _notifyFilePriorityChanged(file);
     }
@@ -71,7 +71,7 @@ class FileTracker {
   }
 
   void handleTaskCompleted(Task task) {
-    for (var file in task.analyzedFiles) {
+    for (final file in task.analyzedFiles) {
       _notifyFilePriorityChanged(_addFile(file));
     }
   }