🎨 Order closer to actual precedence of rules

rubocop-lts · Nov 10, 2023 · 45f3108 · 45f3108
1 parent af1058f
commit 45f3108
Show file tree

Hide file tree

Showing 14 changed files with 66 additions and 70 deletions.
diff --git a/config/ruby-1.8.yml b/config/ruby-1.8.yml
@@ -5,10 +5,6 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-1.8.yml
-
 require:
   - standard-rubocop-lts
   - standard
@@ -27,3 +23,7 @@ inherit_gem:
   standard-performance: config/ruby-1.8.yml
   standard-custom: config/base.yml
   rubocop-performance: config/default.yml
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-1.8.yml
diff --git a/config/ruby-1.9.yml b/config/ruby-1.9.yml
@@ -5,10 +5,6 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-1.9.yml
-
 require:
   - standard-rubocop-lts
   - standard
@@ -27,3 +23,7 @@ inherit_gem:
   standard-performance: config/ruby-1.9.yml
   standard-custom: config/base.yml
   rubocop-performance: config/default.yml
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-1.9.yml
diff --git a/config/ruby-2.0.yml b/config/ruby-2.0.yml
@@ -5,10 +5,6 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-2.0.yml
-
 require:
   - standard-rubocop-lts
   - standard
@@ -27,3 +23,7 @@ inherit_gem:
   standard-performance: config/ruby-2.0.yml
   standard-custom: config/base.yml
   rubocop-performance: config/default.yml
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-2.0.yml
diff --git a/config/ruby-2.1.yml b/config/ruby-2.1.yml
@@ -5,10 +5,6 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-2.1.yml
-
 require:
   - standard-rubocop-lts
   - standard
@@ -27,3 +23,8 @@ inherit_gem:
   standard-performance: config/ruby-2.1.yml
   standard-custom: config/base.yml
   rubocop-performance: config/default.yml
+
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-2.1.yml
diff --git a/config/ruby-2.2.yml b/config/ruby-2.2.yml
@@ -5,10 +5,6 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-2.2.yml
-
 require:
   - standard-rubocop-lts
   - standard
@@ -27,3 +23,7 @@ inherit_gem:
   standard-performance: config/ruby-2.2.yml
   standard-custom: config/base.yml
   rubocop-performance: config/default.yml
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-2.2.yml
diff --git a/config/ruby-2.3.yml b/config/ruby-2.3.yml
@@ -5,10 +5,6 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-2.3.yml
-
 require:
   - standard-rubocop-lts
   - standard
@@ -27,3 +23,7 @@ inherit_gem:
   standard-performance: config/base.yml
   standard-custom: config/base.yml
   rubocop-performance: config/default.yml
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-2.3.yml
diff --git a/config/ruby-2.4.yml b/config/ruby-2.4.yml
@@ -5,10 +5,6 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-2.4.yml
-
 require:
   - standard-rubocop-lts
   - standard
@@ -27,3 +23,7 @@ inherit_gem:
   standard-performance: config/base.yml
   standard-custom: config/base.yml
   rubocop-performance: config/default.yml
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-2.4.yml
diff --git a/config/ruby-2.5.yml b/config/ruby-2.5.yml
@@ -5,10 +5,6 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-2.5.yml
-
 require:
   - standard-rubocop-lts
   - standard
@@ -27,3 +23,7 @@ inherit_gem:
   standard-performance: config/base.yml
   standard-custom: config/base.yml
   rubocop-performance: config/default.yml
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-2.5.yml
diff --git a/config/ruby-2.6.yml b/config/ruby-2.6.yml
@@ -5,10 +5,6 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-2.6.yml
-
 require:
   - standard-rubocop-lts
   - standard
@@ -27,3 +23,7 @@ inherit_gem:
   standard-performance: config/base.yml
   standard-custom: config/base.yml
   rubocop-performance: config/default.yml
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-2.6.yml
diff --git a/config/ruby-2.7.yml b/config/ruby-2.7.yml
@@ -5,16 +5,12 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-2.7.yml
-
 require:
   - standard-rubocop-lts
-  - standard
-  - standard-performance
-  - standard-custom
-  - rubocop-performance
+#  - standard
+#  - standard-performance
+#  - standard-custom
+#  - rubocop-performance
 
 # Load basic rules for this version of Ruby from standard.
 # Rules are overridden in a LIFO stack.
@@ -26,4 +22,8 @@ inherit_gem:
   standard: config/ruby-2.7.yml
   standard-performance: config/base.yml
   standard-custom: config/base.yml
-  rubocop-performance: config/default.yml
+#  rubocop-performance: config/default.yml
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-2.7.yml
diff --git a/config/ruby-3.0.yml b/config/ruby-3.0.yml
@@ -5,10 +5,6 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-3.0.yml
-
 require:
   - standard-rubocop-lts
   - standard
@@ -27,3 +23,7 @@ inherit_gem:
   standard-performance: config/base.yml
   standard-custom: config/base.yml
   rubocop-performance: config/default.yml
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-3.0.yml
diff --git a/config/ruby-3.1.yml b/config/ruby-3.1.yml
@@ -5,10 +5,6 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-3.1.yml
-
 require:
   - standard-rubocop-lts
   - standard
@@ -27,3 +23,7 @@ inherit_gem:
   standard-performance: config/base.yml
   standard-custom: config/base.yml
   rubocop-performance: config/default.yml
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-3.1.yml
diff --git a/config/ruby-3.2.yml b/config/ruby-3.2.yml
@@ -5,16 +5,8 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-3.2.yml
-
-require:
-  - standard-rubocop-lts
-  - standard
-  - standard-performance
-  - standard-custom
-  - rubocop-performance
+#require:
+#  - rubocop-performance
 
 # Load basic rules for this version of Ruby from standard.
 # Rules are overridden in a LIFO stack.
@@ -26,4 +18,7 @@ inherit_gem:
   standard: config/ruby-3.2.yml
   standard-performance: config/base.yml
   standard-custom: config/base.yml
-  rubocop-performance: config/default.yml
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-3.2.yml
diff --git a/config/ruby-3.3.yml b/config/ruby-3.3.yml
@@ -5,21 +5,17 @@ inherit_mode:
     - Exclude
     - Include
 
-inherit_from:
-  - ./base.yml
-  - ./internal/ruby-3.3.yml
-
 require:
   - standard-rubocop-lts
   - standard
   - standard-performance
   - standard-custom
   - rubocop-performance
 
-# TODO: Load basic rules for this version of Ruby from standard, once Standard includes it!
-# See: https://github.com/standardrb/standard/pull/560
+# TODO: Load basic rules for Ruby 3.3 from Standard once they exist!
 #   inherit_gem:
 #     standard: config/ruby-3.3.yml
+
 # Rules are overridden in a LIFO stack.
 # If rubocop-performance is listed first, and standard-performance after it,
 #   then rubocop-performance's rules will take precedence.
@@ -30,3 +26,7 @@ inherit_gem:
   standard-performance: config/base.yml
   standard-custom: config/base.yml
   rubocop-performance: config/default.yml
+
+inherit_from:
+  - ./base.yml
+  - ./internal/ruby-3.3.yml