Merge pull request #49 from github/kh-migrate-to-counters-1

Migrate remaining non-counter rules to counters

Author: Adrián Bolonio

README.md

@@ -23,15 +23,15 @@ require "erblint-github/linters"
 ```yaml 
 ---
 linters:
-  GitHub::Accessibility::AvoidBothDisabledAndAriaDisabled:
+  GitHub::Accessibility::AvoidBothDisabledAndAriaDisabledCounter:
     enabled: true
   GitHub::Accessibility::AvoidGenericLinkTextCounter:
     enabled: true
   GitHub::Accessibility::DisabledAttributeCounter:
     enabled: true
-  GitHub::Accessibility::IframeHasTitle:
+  GitHub::Accessibility::IframeHasTitleCounter:
     enabled: true
-  GitHub::Accessibility::ImageHasAlt:
+  GitHub::Accessibility::ImageHasAltCounter:
     enabled: true
   GitHub::Accessibility::LandmarkHasLabelCounter:
     enabled: true
@@ -41,9 +41,9 @@ linters:
     enabled: true
   GitHub::Accessibility::NoAriaLabelMisuseCounter:
     enabled: true
-  GitHub::Accessibility::NoPositiveTabIndex:
+  GitHub::Accessibility::NoPositiveTabIndexCounter:
     enabled: true
-  GitHub::Accessibility::NoRedundantImageAlt:
+  GitHub::Accessibility::NoRedundantImageAltCounter:
     enabled: true
   GitHub::Accessibility::NoTitleAttributeCounter:
     enabled: true
@@ -53,17 +53,17 @@ linters:
 
 ## Rules
 
-- [GitHub::Accessibility::AvoidBothDisabledAndAriaDisabled](./docs/rules/accessibility/avoid-both-disabled-and-aria-disabled.md)
+- [GitHub::Accessibility::AvoidBothDisabledAndAriaDisabledCounter](./docs/rules/accessibility/avoid-both-disabled-and-aria-disabled-counter.md)
 - [GitHub::Accessibility::AvoidGenericLinkTextCounter](./docs/rules/accessibility/avoid-generic-link-text-counter.md)
 - [GitHub::Accessibility::DisabledAttributeCounter](./docs/rules/accessibility/disabled-attribute-counter.md)
-- [GitHub::Accessibility::IframeHasTitle](./docs/rules/accessibility/iframe-has-title.md)
 - [GitHub::Accessibility::LandmarkHasLabelCounter](./docs/rules/accessibility/landmark-has-label-counter.md)
-- [GitHub::Accessibility::ImageHasAlt](./docs/rules/accessibility/image-has-alt.md)
 - [GitHub::Accessibility::LinkHasHrefCounter](./docs/rules/accessibility/link-has-href-counter.md)
 - [GitHub::Accessibility::NestedInteractiveElementsCounter](./docs/rules/accessibility/nested-interactive-elements-counter.md)
+- [GitHub::Accessibility::IframeHasTitleCounter](./docs/rules/accessibility/iframe-has-title-counter.md)
+- [GitHub::Accessibility::ImageHasAltCounter](./docs/rules/accessibility/image-has-alt-counter.md)
 - [GitHub::Accessibility::NoAriaLabelMisuseCounter](./docs/rules/accessibility/no-aria-label-misuse-counter.md)
-- [GitHub::Accessibility::NoPositiveTabIndex](./docs/rules/accessibility/no-positive-tab-index.md)
-- [GitHub::Accessibility::NoRedundantImageAlt](./docs/rules/accessibility/no-redundant-image-alt.md)
+- [GitHub::Accessibility::NoPositiveTabIndexCounter](./docs/rules/accessibility/no-positive-tab-index-counter.md)
+- [GitHub::Accessibility::NoRedundantImageAltCounter](./docs/rules/accessibility/no-redundant-image-alt-counter.md)
 - [GitHub::Accessibility::NoTitleAttributeCounter](./docs/rules/accessibility/no-title-attribute-counter.md)
 - [GitHub::Accessibility::SvgHasAccessibleTextCounter](./docs/rules/accessibility/svg-has-accessible-text-counter.md)
 

…avoid-both-disabled-and-aria-disabled.md …th-disabled-and-aria-disabled-counter.mddocs/rules/accessibility/avoid-both-disabled-and-aria-disabled.md renamed to docs/rules/accessibility/avoid-both-disabled-and-aria-disabled-counter.md docs/rules/accessibility/avoid-both-disabled-and-aria-disabled.md renamed to docs/rules/accessibility/avoid-both-disabled-and-aria-disabled-counter.md

@@ -6,7 +6,7 @@ module ERBLint
   module Linters
     module GitHub
       module Accessibility
-        class AvoidBothDisabledAndAriaDisabled < Linter
+        class AvoidBothDisabledAndAriaDisabledCounter < Linter
           include ERBLint::Linters::CustomHelpers
           include LinterRegistry
 
@@ -22,7 +22,21 @@ def run(processed_source)
               generate_offense(self.class, processed_source, tag)
             end
 
-            rule_disabled?(processed_source)
+            counter_correct?(processed_source)
+          end
+
+          def autocorrect(processed_source, offense)
+            return unless offense.context
+
+            lambda do |corrector|
+              if processed_source.file_content.include?("erblint:counter #{simple_class_name}")
+                # update the counter if exists
+                corrector.replace(offense.source_range, offense.context)
+              else
+                # add comment with counter if none
+                corrector.insert_before(processed_source.source_buffer.source_range, "#{offense.context}\n")
+              end
+            end
           end
         end
       end

…/rules/accessibility/iframe-has-title.md …ccessibility/iframe-has-title-counter.mddocs/rules/accessibility/iframe-has-title.md renamed to docs/rules/accessibility/iframe-has-title-counter.md docs/rules/accessibility/iframe-has-title.md renamed to docs/rules/accessibility/iframe-has-title-counter.md

@@ -6,7 +6,7 @@ module ERBLint
   module Linters
     module GitHub
       module Accessibility
-        class IframeHasTitle < Linter
+        class IframeHasTitleCounter < Linter
           include ERBLint::Linters::CustomHelpers
           include LinterRegistry
 
@@ -23,7 +23,21 @@ def run(processed_source)
               generate_offense(self.class, processed_source, tag) if title.empty? && !aria_hidden?(tag)
             end
 
-            rule_disabled?(processed_source)
+            counter_correct?(processed_source)
+          end
+
+          def autocorrect(processed_source, offense)
+            return unless offense.context
+
+            lambda do |corrector|
+              if processed_source.file_content.include?("erblint:counter #{simple_class_name}")
+                # update the counter if exists
+                corrector.replace(offense.source_range, offense.context)
+              else
+                # add comment with counter if none
+                corrector.insert_before(processed_source.source_buffer.source_range, "#{offense.context}\n")
+              end
+            end
           end
 
           private

docs/rules/accessibility/image-has-alt.md …s/accessibility/image-has-alt-counter.mddocs/rules/accessibility/image-has-alt.md renamed to docs/rules/accessibility/image-has-alt-counter.md docs/rules/accessibility/image-has-alt.md renamed to docs/rules/accessibility/image-has-alt-counter.md

@@ -6,7 +6,7 @@ module ERBLint
   module Linters
     module GitHub
       module Accessibility
-        class ImageHasAlt < Linter
+        class ImageHasAltCounter < Linter
           include ERBLint::Linters::CustomHelpers
           include LinterRegistry
 
@@ -22,7 +22,21 @@ def run(processed_source)
               generate_offense(self.class, processed_source, tag) if alt.empty?
             end
 
-            rule_disabled?(processed_source)
+            counter_correct?(processed_source)
+          end
+
+          def autocorrect(processed_source, offense)
+            return unless offense.context
+
+            lambda do |corrector|
+              if processed_source.file_content.include?("erblint:counter #{simple_class_name}")
+                # update the counter if exists
+                corrector.replace(offense.source_range, offense.context)
+              else
+                # add comment with counter if none
+                corrector.insert_before(processed_source.source_buffer.source_range, "#{offense.context}\n")
+              end
+            end
           end
         end
       end

…s/accessibility/no-positive-tab-index.md …ibility/no-positive-tab-index-counter.mddocs/rules/accessibility/no-positive-tab-index.md renamed to docs/rules/accessibility/no-positive-tab-index-counter.md docs/rules/accessibility/no-positive-tab-index.md renamed to docs/rules/accessibility/no-positive-tab-index-counter.md

@@ -6,7 +6,7 @@ module ERBLint
   module Linters
     module GitHub
       module Accessibility
-        class NoPositiveTabIndex < Linter
+        class NoPositiveTabIndexCounter < Linter
           include ERBLint::Linters::CustomHelpers
           include LinterRegistry
 
@@ -20,7 +20,21 @@ def run(processed_source)
               generate_offense(self.class, processed_source, tag)
             end
 
-            rule_disabled?(processed_source)
+            counter_correct?(processed_source)
+          end
+
+          def autocorrect(processed_source, offense)
+            return unless offense.context
+
+            lambda do |corrector|
+              if processed_source.file_content.include?("erblint:counter #{simple_class_name}")
+                # update the counter if exists
+                corrector.replace(offense.source_range, offense.context)
+              else
+                # add comment with counter if none
+                corrector.insert_before(processed_source.source_buffer.source_range, "#{offense.context}\n")
+              end
+            end
           end
         end
       end