Merge branch 'fix-ambiguous-import' of https://github.com/fmorschel/sdk…

… into fix-ambiguous-import
dart-lang · Jan 16, 2025 · aa74182 · aa74182
2 parents 6d57614 + c93d33b
commit aa74182
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/pkg/analyzer/lib/dart/analysis/code_style_options.dart b/pkg/analyzer/lib/dart/analysis/code_style_options.dart
@@ -31,6 +31,10 @@ abstract class CodeStyleOptions {
   /// The preferred quote based on the enabled lints, otherwise a single quote.
   String get preferredQuoteForStrings;
 
+  /// Whether combinators should be ordered alphabetically. Difined by
+  /// `combinators_ordering`.
+  bool get sortCombinators;
+
   /// Whether constructors should be sorted first, before other class members.
   bool get sortConstructorsFirst;
 

diff --git a/pkg/analyzer/lib/src/analysis_options/code_style_options.dart b/pkg/analyzer/lib/src/analysis_options/code_style_options.dart
@@ -38,6 +38,9 @@ class CodeStyleOptionsImpl implements CodeStyleOptions {
   @override
   String get preferredQuoteForStrings => _lintQuote() ?? "'";
 
+  @override
+  bool get sortCombinators => _isLintEnabled('combinators_ordering');
+
   @override
   bool get sortConstructorsFirst => _isLintEnabled('sort_constructors_first');