diff --git a/analysis_options.yaml b/analysis_options.yaml
index f51e2b02076b..b9c790dbe8e2 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -36,11 +36,11 @@ linter:
     - cancel_subscriptions
 #    - cascade_invocations
     - cast_nullable_to_non_nullable
+    - combinators_ordering
 #    - close_sinks # https://github.com/dart-lang/linter/issues/268
     - comment_references
     - directives_ordering
     - discarded_futures
-    - invariant_booleans
     - join_return_with_assignment
 #    - lines_longer_than_80_chars # under review (see #1068)
     - literal_only_boolean_expressions
diff --git a/lib/src/analyzer.dart b/lib/src/analyzer.dart
index 423d595afded..0915b62735e4 100644
--- a/lib/src/analyzer.dart
+++ b/lib/src/analyzer.dart
@@ -29,15 +29,15 @@ export 'package:analyzer/src/generated/source.dart' show LineInfo, Source;
 export 'package:analyzer/src/lint/linter.dart'
     show
         DartLinter,
-        LintRule,
         Group,
-        Maturity,
+        LintFilter,
+        LintRule,
         LinterContext,
         LinterOptions,
-        LintFilter,
+        Maturity,
         NodeLintRegistry,
         NodeLintRule;
-export 'package:analyzer/src/lint/pub.dart' show PubspecVisitor, PSEntry;
+export 'package:analyzer/src/lint/pub.dart' show PSEntry, PubspecVisitor;
 export 'package:analyzer/src/lint/util.dart' show Spelunker;
 export 'package:analyzer/src/services/lint.dart' show lintRegistry;
 export 'package:analyzer/src/workspace/pub.dart' show PubWorkspacePackage;
diff --git a/lib/src/formatter.dart b/lib/src/formatter.dart
index 4ba056f05042..7371169dd35e 100644
--- a/lib/src/formatter.dart
+++ b/lib/src/formatter.dart
@@ -8,7 +8,7 @@ import 'dart:math';
 import 'package:analyzer/error/error.dart';
 
 import 'analyzer.dart';
-import 'util/charcodes.dart' show $pipe, $backslash;
+import 'util/charcodes.dart' show $backslash, $pipe;
 import 'util/score_utils.dart';
 
 // Number of times to perform linting to get stable benchmarks.