From fbf26a29c5f072bd10ac6ada6369ce254c5c206f Mon Sep 17 00:00:00 2001
From: Christian Bruckmayer <christian.bruckmayer@shopify.com>
Date: Wed, 4 Nov 2020 18:08:57 +0000
Subject: [PATCH 01/85] Implement file cache

First approach to implement a file cache.

https://github.com/Shopify/erb-lint/issues/158

Co-authored-by: Mike Dalessio <mike.dalessio@gmail.com>
---
 lib/erb_lint.rb       |  2 +-
 lib/erb_lint/all.rb   |  1 +
 lib/erb_lint/cache.rb | 47 +++++++++++++++++++++++++++++++++++++++++++
 lib/erb_lint/cli.rb   | 33 +++++++++++++++++++++++++++++-
 4 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 lib/erb_lint/cache.rb

diff --git a/lib/erb_lint.rb b/lib/erb_lint.rb
index 66825167..e6afe535 100644
--- a/lib/erb_lint.rb
+++ b/lib/erb_lint.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require "erb_lint/version"
+require "erb_lint/version"
\ No newline at end of file
diff --git a/lib/erb_lint/all.rb b/lib/erb_lint/all.rb
index ecd95cb0..8280343a 100644
--- a/lib/erb_lint/all.rb
+++ b/lib/erb_lint/all.rb
@@ -3,6 +3,7 @@
 require "rubocop"
 
 require "erb_lint"
+require "erb_lint/cache"
 require "erb_lint/corrector"
 require "erb_lint/file_loader"
 require "erb_lint/linter_config"
diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
new file mode 100644
index 00000000..72d16f6f
--- /dev/null
+++ b/lib/erb_lint/cache.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module ERBLint
+  class Cache
+    CACHE_DIRECTORY = '.erb-lint-cache'
+    private_constant :CACHE_DIRECTORY
+
+    def initialize(config)
+      @config = config.to_hash
+    end
+
+    def [](filename)
+      JSON.parse(File.read(File.join(CACHE_DIRECTORY, checksum(filename))))
+    end
+    
+    def include?(filename)
+      File.exist?(File.join(CACHE_DIRECTORY, checksum(filename)))
+    end
+    
+    def []=(filename, messages)
+      FileUtils.mkdir_p(CACHE_DIRECTORY)
+
+      File.open(File.join(CACHE_DIRECTORY, checksum(filename)), 'wb') do |f|
+        f.write messages.to_json
+      end
+    end
+
+    private
+
+    attr_reader :config
+
+    def checksum(file)
+      digester = Digest::SHA1.new
+      mode = File.stat(file).mode
+
+      digester.update(
+        "#{file}#{mode}#{config.to_s}"
+      )
+      digester.file(file)
+      digester.hexdigest
+    rescue Errno::ENOENT
+      # Spurious files that come and go should not cause a crash, at least not
+      # here.
+      '_'
+    end
+  end
+end
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 7e5396eb..449de305 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -33,6 +33,7 @@ def run(args = ARGV)
       @files = @options[:stdin] || dupped_args
 
       load_config
+      @cache = Cache.new(config)
 
       if !@files.empty? && lint_files.empty?
         if allow_no_files?
@@ -65,7 +66,7 @@ def run(args = ARGV)
       lint_files.each do |filename|
         runner.clear_offenses
         begin
-          file_content = run_with_corrections(runner, filename)
+          puts file_content = run_on_file(runner, filename)
         rescue => e
           @stats.exceptions += 1
           puts "Exception occurred when processing: #{relative_filename(filename)}"
@@ -99,10 +100,36 @@ def run(args = ARGV)
 
     private
 
+    attr_reader :cache, :config
+
+    def run_on_file(runner, filename)
+      if with_cache? && !autocorrect?
+        run_using_cache(runner, filename)
+      else
+        run_with_corrections(runner, filename)
+      end
+    end
+
+    def run_using_cache(runner, filename)
+      puts cache.include?(filename)
+      if cache.include?(filename) && !autocorrect?
+        result = cache[filename]
+        @stats.found += result.size
+        result
+      else
+        result = run_with_corrections(runner, filename)
+        cache[filename] = result
+      end
+    end
+
     def autocorrect?
       @options[:autocorrect]
     end
 
+    def with_cache?
+      @options[:with_cache]
+    end
+
     def run_with_corrections(runner, filename)
       file_content = read_content(filename)
 
@@ -283,6 +310,10 @@ def option_parser
           @options[:enabled_linters] = known_linter_names
         end
 
+        opts.on("--with_cache", "Enable caching") do |config|
+          @options[:with_cache] = config
+        end
+
         opts.on("--enable-linters LINTER[,LINTER,...]", Array,
           "Only use specified linter", "Known linters are: #{known_linter_names.join(", ")}") do |linters|
           linters.each do |linter|

From 17ce88729da60df5fec50e1679ede38d0d9a6cf3 Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Fri, 12 Aug 2022 16:15:20 -0400
Subject: [PATCH 02/85] Initial cleaning implementation

---
 Gemfile               |  1 +
 lib/erb_lint/cache.rb | 35 ++++++++++++++++++++++++++++++++++-
 lib/erb_lint/cli.rb   | 18 +++++++++++++++---
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 548e391e..efd1b411 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem 'pry'
 
 group "test" do
   gem "fakefs"
diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index 72d16f6f..3416c8cd 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -7,6 +7,8 @@ class Cache
 
     def initialize(config)
       @config = config.to_hash
+      @hits = []
+      @new_results = []
     end
 
     def [](filename)
@@ -25,9 +27,40 @@ def []=(filename, messages)
       end
     end
 
+    def add_hit(hit)
+      @hits.push(hit)
+    end
+
+    def add_new_result(filename)
+      @new_results.push(filename)
+    end
+
+    def clean
+      if hits.empty?
+        puts "Cache being created, skipping clean"
+        return
+      end
+
+      cache_files = Dir.new(CACHE_DIRECTORY).children
+      hits_as_checksums = hits.map{|hit| checksum(hit) }
+      new_results_as_checksums = new_results.map{|new_result| checksum(new_result) }
+      cache_files.each do |cache_file|
+        next if hits_as_checksums.include?(cache_file)
+        if new_results_as_checksums.include?(cache_file)
+          puts "Skipping deletion of new cache result #{cache_file} in clean"
+          return
+        end
+
+        puts "Cleaning deleted cached file with checksum #{cache_file}}"
+        File.delete(File.join(CACHE_DIRECTORY, cache_file))
+      end
+
+      @hits = []
+    end
+
     private
 
-    attr_reader :config
+    attr_reader :config, :hits, :new_results
 
     def checksum(file)
       digester = Digest::SHA1.new
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 449de305..7270d745 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -66,7 +66,7 @@ def run(args = ARGV)
       lint_files.each do |filename|
         runner.clear_offenses
         begin
-          puts file_content = run_on_file(runner, filename)
+          file_content = run_on_file(runner, filename)
         rescue => e
           @stats.exceptions += 1
           puts "Exception occurred when processing: #{relative_filename(filename)}"
@@ -78,6 +78,8 @@ def run(args = ARGV)
         end
       end
 
+      cache.clean if clean_cache?
+
       reporter.show
 
       if stdin? && autocorrect?
@@ -111,14 +113,16 @@ def run_on_file(runner, filename)
     end
 
     def run_using_cache(runner, filename)
-      puts cache.include?(filename)
+      # puts cache.include?(filename)
       if cache.include?(filename) && !autocorrect?
         result = cache[filename]
         @stats.found += result.size
+        cache.add_hit(filename) if clean_cache?
         result
       else
         result = run_with_corrections(runner, filename)
         cache[filename] = result
+        cache.add_new_result(filename) if clean_cache?
       end
     end
 
@@ -130,6 +134,10 @@ def with_cache?
       @options[:with_cache]
     end
 
+    def clean_cache?
+      @options[:clean_cache]
+    end
+
     def run_with_corrections(runner, filename)
       file_content = read_content(filename)
 
@@ -310,10 +318,14 @@ def option_parser
           @options[:enabled_linters] = known_linter_names
         end
 
-        opts.on("--with_cache", "Enable caching") do |config|
+        opts.on("--with-cache", "Enable caching") do |config|
           @options[:with_cache] = config
         end
 
+        opts.on("--clean-cache", "Clean cache") do |config|
+          @options[:clean_cache] = config
+        end
+
         opts.on("--enable-linters LINTER[,LINTER,...]", Array,
           "Only use specified linter", "Known linters are: #{known_linter_names.join(", ")}") do |linters|
           linters.each do |linter|

From b5aeb01ec9f42e55ce061a9ebd8c57050144ef99 Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Sat, 13 Aug 2022 14:08:30 -0400
Subject: [PATCH 03/85] Rename clean to prune, implement clearing, add
 autocorrect error message

---
 lib/erb_lint/cache.rb | 16 +++++++++++++---
 lib/erb_lint/cli.rb   | 36 +++++++++++++++++++++++++++---------
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index 3416c8cd..1497948d 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -35,9 +35,9 @@ def add_new_result(filename)
       @new_results.push(filename)
     end
 
-    def clean
+    def prune
       if hits.empty?
-        puts "Cache being created, skipping clean"
+        puts "Cache being created for the first time, skipping prune"
         return
       end
 
@@ -47,7 +47,7 @@ def clean
       cache_files.each do |cache_file|
         next if hits_as_checksums.include?(cache_file)
         if new_results_as_checksums.include?(cache_file)
-          puts "Skipping deletion of new cache result #{cache_file} in clean"
+          puts "Skipping deletion of new cache result #{cache_file} in prune"
           return
         end
 
@@ -58,6 +58,16 @@ def clean
       @hits = []
     end
 
+    def clear
+      puts "Clearing cache by deleting cache directory..."
+      begin
+        FileUtils.remove_dir(CACHE_DIRECTORY)
+        puts "...cache directory cleared"
+      rescue Errno::ENOENT => e
+        puts "...directory already doesn't exist, skipped deletion."
+      end
+    end
+
     private
 
     attr_reader :config, :hits, :new_results
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 7270d745..3e57f046 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -33,7 +33,18 @@ def run(args = ARGV)
       @files = @options[:stdin] || dupped_args
 
       load_config
-      @cache = Cache.new(config)
+
+      if with_cache? && autocorrect?
+        failure!("cannot run autocorrect mode with cache")
+      end
+
+      @cache = Cache.new(config) if with_cache? || clear_cache?
+      if clear_cache?
+        cache.clear
+        exit 0
+      end
+
+
 
       if !@files.empty? && lint_files.empty?
         if allow_no_files?
@@ -78,7 +89,7 @@ def run(args = ARGV)
         end
       end
 
-      cache.clean if clean_cache?
+      cache.prune if prune_cache?
 
       reporter.show
 
@@ -116,13 +127,12 @@ def run_using_cache(runner, filename)
       # puts cache.include?(filename)
       if cache.include?(filename) && !autocorrect?
         result = cache[filename]
-        @stats.found += result.size
-        cache.add_hit(filename) if clean_cache?
+        cache.add_hit(filename) if prune_cache?
         result
       else
         result = run_with_corrections(runner, filename)
         cache[filename] = result
-        cache.add_new_result(filename) if clean_cache?
+        cache.add_new_result(filename) if prune_cache?
       end
     end
 
@@ -134,8 +144,12 @@ def with_cache?
       @options[:with_cache]
     end
 
-    def clean_cache?
-      @options[:clean_cache]
+    def prune_cache?
+      @options[:prune_cache]
+    end
+
+    def clear_cache?
+      @options[:clear_cache]
     end
 
     def run_with_corrections(runner, filename)
@@ -322,8 +336,12 @@ def option_parser
           @options[:with_cache] = config
         end
 
-        opts.on("--clean-cache", "Clean cache") do |config|
-          @options[:clean_cache] = config
+        opts.on("--prune-cache", "Prune cache") do |config|
+          @options[:prune_cache] = config
+        end
+
+        opts.on("--clear-cache", "Clear cache") do |config|
+          @options[:clear_cache] = config
         end
 
         opts.on("--enable-linters LINTER[,LINTER,...]", Array,

From 95b5e224cf484ad7bcd772281c1c52a78ff3b969 Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Sat, 13 Aug 2022 14:10:24 -0400
Subject: [PATCH 04/85] Lints and cops

---
 Gemfile               |  2 +-
 Gemfile.lock          |  6 ++++++
 lib/erb_lint.rb       |  2 +-
 lib/erb_lint/cache.rb | 23 ++++++++++++-----------
 lib/erb_lint/cli.rb   |  4 +---
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index efd1b411..3ef7f8e2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem 'pry'
+gem "pry"
 
 group "test" do
   gem "fakefs"
diff --git a/Gemfile.lock b/Gemfile.lock
index 72c45979..b5d2ec89 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,6 +32,7 @@ GEM
       parser (>= 2.4)
       smart_properties
     builder (3.2.4)
+    coderay (1.1.3)
     concurrent-ruby (1.1.10)
     crass (1.0.6)
     diff-lcs (1.5.0)
@@ -42,6 +43,7 @@ GEM
     loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    method_source (1.0.0)
     mini_portile2 (2.8.0)
     minitest (5.16.3)
     nokogiri (1.13.8)
@@ -50,6 +52,9 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     racc (1.6.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -98,6 +103,7 @@ PLATFORMS
 DEPENDENCIES
   erb_lint!
   fakefs
+  pry
   rake
   rspec
   rubocop
diff --git a/lib/erb_lint.rb b/lib/erb_lint.rb
index e6afe535..66825167 100644
--- a/lib/erb_lint.rb
+++ b/lib/erb_lint.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require "erb_lint/version"
\ No newline at end of file
+require "erb_lint/version"
diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index 1497948d..4bf13f06 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -2,7 +2,7 @@
 
 module ERBLint
   class Cache
-    CACHE_DIRECTORY = '.erb-lint-cache'
+    CACHE_DIRECTORY = ".erb-lint-cache"
     private_constant :CACHE_DIRECTORY
 
     def initialize(config)
@@ -14,16 +14,16 @@ def initialize(config)
     def [](filename)
       JSON.parse(File.read(File.join(CACHE_DIRECTORY, checksum(filename))))
     end
-    
+
     def include?(filename)
       File.exist?(File.join(CACHE_DIRECTORY, checksum(filename)))
     end
-    
+
     def []=(filename, messages)
       FileUtils.mkdir_p(CACHE_DIRECTORY)
 
-      File.open(File.join(CACHE_DIRECTORY, checksum(filename)), 'wb') do |f|
-        f.write messages.to_json
+      File.open(File.join(CACHE_DIRECTORY, checksum(filename)), "wb") do |f|
+        f.write(messages.to_json)
       end
     end
 
@@ -42,13 +42,14 @@ def prune
       end
 
       cache_files = Dir.new(CACHE_DIRECTORY).children
-      hits_as_checksums = hits.map{|hit| checksum(hit) }
-      new_results_as_checksums = new_results.map{|new_result| checksum(new_result) }
+      hits_as_checksums = hits.map { |hit| checksum(hit) }
+      new_results_as_checksums = new_results.map { |new_result| checksum(new_result) }
       cache_files.each do |cache_file|
         next if hits_as_checksums.include?(cache_file)
+
         if new_results_as_checksums.include?(cache_file)
           puts "Skipping deletion of new cache result #{cache_file} in prune"
-          return
+          next
         end
 
         puts "Cleaning deleted cached file with checksum #{cache_file}}"
@@ -63,7 +64,7 @@ def clear
       begin
         FileUtils.remove_dir(CACHE_DIRECTORY)
         puts "...cache directory cleared"
-      rescue Errno::ENOENT => e
+      rescue Errno::ENOENT
         puts "...directory already doesn't exist, skipped deletion."
       end
     end
@@ -77,14 +78,14 @@ def checksum(file)
       mode = File.stat(file).mode
 
       digester.update(
-        "#{file}#{mode}#{config.to_s}"
+        "#{file}#{mode}#{config}"
       )
       digester.file(file)
       digester.hexdigest
     rescue Errno::ENOENT
       # Spurious files that come and go should not cause a crash, at least not
       # here.
-      '_'
+      "_"
     end
   end
 end
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 3e57f046..9f18aabb 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -41,11 +41,9 @@ def run(args = ARGV)
       @cache = Cache.new(config) if with_cache? || clear_cache?
       if clear_cache?
         cache.clear
-        exit 0
+        exit(0)
       end
 
-
-
       if !@files.empty? && lint_files.empty?
         if allow_no_files?
           success!("no files found...\n")

From 7032a73ee0ed805473a0d0b5c7456d618774b2df Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Sat, 13 Aug 2022 15:59:37 -0400
Subject: [PATCH 05/85] Add integration specs

---
 lib/erb_lint/cache.rb     | 17 +++++-----
 lib/erb_lint/cli.rb       | 15 ++++++---
 spec/erb_lint/cli_spec.rb | 68 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 86 insertions(+), 14 deletions(-)

diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index 4bf13f06..7e21c63e 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -3,12 +3,12 @@
 module ERBLint
   class Cache
     CACHE_DIRECTORY = ".erb-lint-cache"
-    private_constant :CACHE_DIRECTORY
 
     def initialize(config)
       @config = config.to_hash
       @hits = []
       @new_results = []
+      puts "Cache mode is on"
     end
 
     def [](filename)
@@ -59,14 +59,15 @@ def prune
       @hits = []
     end
 
+    def cache_dir_exists?
+      File.directory?(CACHE_DIRECTORY)
+    end
+
     def clear
-      puts "Clearing cache by deleting cache directory..."
-      begin
-        FileUtils.remove_dir(CACHE_DIRECTORY)
-        puts "...cache directory cleared"
-      rescue Errno::ENOENT
-        puts "...directory already doesn't exist, skipped deletion."
-      end
+      return unless cache_dir_exists?
+
+      puts "Clearing cache by deleting cache directory"
+      FileUtils.rm_r(CACHE_DIRECTORY)
     end
 
     private
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 9f18aabb..c4f6c7ab 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -30,18 +30,23 @@ def initialize
     def run(args = ARGV)
       dupped_args = args.dup
       load_options(dupped_args)
-      @files = @options[:stdin] || dupped_args
-
-      load_config
 
       if with_cache? && autocorrect?
         failure!("cannot run autocorrect mode with cache")
       end
 
+      @files = @options[:stdin] || dupped_args
+
+      load_config
+
       @cache = Cache.new(config) if with_cache? || clear_cache?
       if clear_cache?
-        cache.clear
-        exit(0)
+        if cache.cache_dir_exists?
+          cache.clear
+          success!("cache directory cleared")
+        else
+          failure!("cache directory already doesn't exist, skipped deletion.")
+        end
       end
 
       if !@files.empty? && lint_files.empty?
diff --git a/spec/erb_lint/cli_spec.rb b/spec/erb_lint/cli_spec.rb
index 77c61b5b..d282b131 100644
--- a/spec/erb_lint/cli_spec.rb
+++ b/spec/erb_lint/cli_spec.rb
@@ -2,6 +2,7 @@
 
 require "spec_helper"
 require "erb_lint/cli"
+require "erb_lint/cache"
 require "pp"
 require "fakefs"
 require "fakefs/spec_helpers"
@@ -97,6 +98,34 @@ def run(processed_source)
       end
     end
 
+    context "with --clear-cache" do
+      let(:args) { ["--clear-cache"] }
+      context "without a cache folder" do
+        it { expect { subject }.to(output(/cache directory already doesn't exist, skipped deletion/).to_stderr) }
+        it "shows cache not cleared message if cache is empty and fails" do
+          expect(subject).to(be(false))
+        end
+      end
+
+      context "with a cache folder" do
+        before do
+          FileUtils.mkdir_p(ERBLint::Cache::CACHE_DIRECTORY)
+        end
+        it {
+          expect do
+            subject
+          end.to(output(<<~EOF).to_stdout)
+            Cache mode is on
+            Clearing cache by deleting cache directory
+            cache directory cleared
+          EOF
+        }
+        it "is successful and empties the cache if there are cache file" do
+          expect(subject).to(be(true))
+        end
+      end
+    end
+
     context "with --config" do
       context "when file does not exist" do
         let(:args) { ["--config", ".somefile.yml"] }
@@ -170,7 +199,7 @@ def run(processed_source)
           end
         end
 
-        context "when only errors with serverity info are found" do
+        context "when only errors with severity info are found" do
           let(:args) { ["--enable-linter", "linter_with_info_errors", linted_file] }
 
           it "shows all error messages and line numbers" do
@@ -218,6 +247,19 @@ def run(processed_source)
             expect(subject).to(be(false))
           end
         end
+
+        context "with cache" do
+          let(:args) { ["--enable-linter", "linter_without_errors", "--with-cache", linted_file] }
+
+          it "lints the file and adds it to the cache" do
+            expect(Dir[ERBLint::Cache::CACHE_DIRECTORY].length).to(be(0))
+
+            expect { subject }.to(output(/Cache mode is on/).to_stdout)
+            expect(subject).to(be(true))
+
+            expect(Dir[ERBLint::Cache::CACHE_DIRECTORY].length).to(be(1))
+          end
+        end
       end
     end
 
@@ -428,6 +470,19 @@ def run(processed_source)
             it "is successful" do
               expect(subject).to(be(true))
             end
+
+            context "with cache" do
+              let(:args) { ["--enable-linter", "linter_without_errors", "--with-cache", linted_dir] }
+
+              it "lints the file and adds it to the cache" do
+                expect(Dir[ERBLint::Cache::CACHE_DIRECTORY].length).to(be(0))
+
+                expect { subject }.to(output(/Cache mode is on/).to_stdout)
+                expect(subject).to(be(true))
+
+                expect(Dir[ERBLint::Cache::CACHE_DIRECTORY].length).to(be(1))
+              end
+            end
           end
         end
       end
@@ -531,6 +586,17 @@ def run(processed_source)
               expect { subject }.to(output(/#{file_content}\n/).to_stdout)
             end
           end
+
+          context "when autocorrecting and caching are turned on" do
+            # We assume that linter_with_errors is not autocorrectable...
+            let(:args) do
+              ["--enable-linter", "linter_without_errors", "--stdin", linted_file, "--autocorrect", "--with-cache"]
+            end
+
+            it "throws an error saying the two modes cannot be used together" do
+              expect { subject }.to(output(/cannot run autocorrect mode with cache/).to_stderr)
+            end
+          end
         end
 
         context "when no errors are found" do

From 6012ae87913ed0e0517ec1acf07766bbe35977fa Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Sun, 14 Aug 2022 13:41:52 -0400
Subject: [PATCH 06/85] Fix cache implementation, clean up code

---
 lib/erb_lint/cache.rb   | 17 +++++++++-------
 lib/erb_lint/cli.rb     | 29 ++++++++++++++-------------
 lib/erb_lint/linter.rb  |  2 +-
 lib/erb_lint/offense.rb | 43 +++++++++++++++++++++++++++++++++++++++++
 lib/erb_lint/runner.rb  |  4 ++++
 5 files changed, 74 insertions(+), 21 deletions(-)

diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index 7e21c63e..6fb0e0c0 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -4,26 +4,29 @@ module ERBLint
   class Cache
     CACHE_DIRECTORY = ".erb-lint-cache"
 
-    def initialize(config)
-      @config = config.to_hash
+    def initialize(config, file_loader = nil)
+      @config = config
+      @file_loader = file_loader
       @hits = []
       @new_results = []
       puts "Cache mode is on"
     end
 
     def [](filename)
-      JSON.parse(File.read(File.join(CACHE_DIRECTORY, checksum(filename))))
+      JSON.parse(File.read(File.join(CACHE_DIRECTORY, checksum(filename)))).map do |offense|
+        ERBLint::Offense.from_json(offense, @file_loader, config)
+      end
     end
 
     def include?(filename)
       File.exist?(File.join(CACHE_DIRECTORY, checksum(filename)))
     end
 
-    def []=(filename, messages)
+    def []=(filename, offenses_as_json)
       FileUtils.mkdir_p(CACHE_DIRECTORY)
 
       File.open(File.join(CACHE_DIRECTORY, checksum(filename)), "wb") do |f|
-        f.write(messages.to_json)
+        f.write(offenses_as_json)
       end
     end
 
@@ -52,7 +55,7 @@ def prune
           next
         end
 
-        puts "Cleaning deleted cached file with checksum #{cache_file}}"
+        puts "Cleaning deleted cached file with checksum #{cache_file}"
         File.delete(File.join(CACHE_DIRECTORY, cache_file))
       end
 
@@ -79,7 +82,7 @@ def checksum(file)
       mode = File.stat(file).mode
 
       digester.update(
-        "#{file}#{mode}#{config}"
+        "#{file}#{mode}#{config.to_hash}"
       )
       digester.file(file)
       digester.hexdigest
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index c4f6c7ab..15aa2673 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -39,7 +39,7 @@ def run(args = ARGV)
 
       load_config
 
-      @cache = Cache.new(config) if with_cache? || clear_cache?
+      @cache = Cache.new(@config, file_loader) if with_cache? || clear_cache?
       if clear_cache?
         if cache.cache_dir_exists?
           cache.clear
@@ -119,22 +119,24 @@ def run(args = ARGV)
     attr_reader :cache, :config
 
     def run_on_file(runner, filename)
+      file_content = read_content(filename)
       if with_cache? && !autocorrect?
-        run_using_cache(runner, filename)
+        run_using_cache(runner, filename, file_content)
       else
-        run_with_corrections(runner, filename)
+        file_content = run_with_corrections(runner, filename, file_content)
       end
+      log_offense_stats(runner, filename)
+      file_content
     end
 
-    def run_using_cache(runner, filename)
+    def run_using_cache(runner, filename, file_content)
       # puts cache.include?(filename)
       if cache.include?(filename) && !autocorrect?
-        result = cache[filename]
+        runner.restore_offenses(cache[filename])
         cache.add_hit(filename) if prune_cache?
-        result
       else
-        result = run_with_corrections(runner, filename)
-        cache[filename] = result
+        run_with_corrections(runner, filename, file_content)
+        cache[filename] = runner.offenses.map(&:to_json_format).to_json
         cache.add_new_result(filename) if prune_cache?
       end
     end
@@ -155,9 +157,7 @@ def clear_cache?
       @options[:clear_cache]
     end
 
-    def run_with_corrections(runner, filename)
-      file_content = read_content(filename)
-
+    def run_with_corrections(runner, filename, file_content)
       7.times do
         processed_source = ERBLint::ProcessedSource.new(filename, file_content)
         runner.run(processed_source)
@@ -179,6 +179,11 @@ def run_with_corrections(runner, filename)
         file_content = corrector.corrected_content
         runner.clear_offenses
       end
+
+      file_content
+    end
+
+    def log_offense_stats(runner, filename)
       offenses_filename = relative_filename(filename)
       offenses = runner.offenses || []
 
@@ -190,8 +195,6 @@ def run_with_corrections(runner, filename)
 
       @stats.processed_files[offenses_filename] ||= []
       @stats.processed_files[offenses_filename] |= offenses
-
-      file_content
     end
 
     def read_content(filename)
diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
index 36c62511..3d452c90 100644
--- a/lib/erb_lint/linter.rb
+++ b/lib/erb_lint/linter.rb
@@ -30,7 +30,7 @@ def support_autocorrect?
       end
     end
 
-    attr_reader :offenses
+    attr_reader :offenses, :config
 
     # Must be implemented by the concrete inheriting class.
     def initialize(file_loader, config)
diff --git a/lib/erb_lint/offense.rb b/lib/erb_lint/offense.rb
index dc66014c..d730f9e4 100644
--- a/lib/erb_lint/offense.rb
+++ b/lib/erb_lint/offense.rb
@@ -17,6 +17,49 @@ def initialize(linter, source_range, message, context = nil, severity = nil)
       @severity = severity
     end
 
+    def to_json_format
+      {
+        linter_config: linter.config.to_hash,
+        source_range: source_range_to_json_format,
+        message: message,
+        context: context,
+        severity: severity,
+      }
+    end
+
+    def source_range_to_json_format
+      {
+        begin_pos: source_range.begin_pos,
+        end_pos: source_range.end_pos,
+        source_buffer_source: source_range.source_buffer.source,
+        source_buffer_name: source_range.source_buffer.name,
+      }
+    end
+
+    def self.from_json(parsed_json, file_loader, config)
+      parsed_json.transform_keys!(&:to_sym)
+      linter_config = ERBLint::LinterConfig.new(parsed_json[:linter_config])
+      new(
+        linter_config,
+        source_range_from_json_format(parsed_json[:source_range]),
+        parsed_json[:message].presence,
+        parsed_json[:context].presence,
+        parsed_json[:severity].presence
+      )
+    end
+
+    def self.source_range_from_json_format(parsed_json_source_range)
+      parsed_json_source_range.transform_keys!(&:to_sym)
+      Parser::Source::Range.new(
+        Parser::Source::Buffer.new(
+          parsed_json_source_range[:source_buffer_name],
+          source: parsed_json_source_range[:source_buffer_source]
+        ),
+        parsed_json_source_range[:begin_pos],
+        parsed_json_source_range[:end_pos]
+      )
+    end
+
     def inspect
       "#<#{self.class.name} linter=#{linter.class.name} "\
         "source_range=#{source_range.begin_pos}...#{source_range.end_pos} "\
diff --git a/lib/erb_lint/runner.rb b/lib/erb_lint/runner.rb
index 3965872c..f769f25a 100644
--- a/lib/erb_lint/runner.rb
+++ b/lib/erb_lint/runner.rb
@@ -30,5 +30,9 @@ def clear_offenses
       @offenses = []
       @linters.each(&:clear_offenses)
     end
+
+    def restore_offenses(offenses)
+      @offenses.concat(offenses)
+    end
   end
 end

From ad47b9832df9a71da9f65ffd52100f4e453688b7 Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Sun, 14 Aug 2022 20:09:07 -0400
Subject: [PATCH 07/85] Specs for cache and associated changes

---
 lib/erb_lint/cache.rb                         |   4 +-
 lib/erb_lint/cli.rb                           |   2 +-
 lib/erb_lint/offense.rb                       |  18 +-
 spec/erb_lint/cache_spec.rb                   | 172 ++++++++++++++++++
 spec/erb_lint/fixtures/cache_file_content     |   1 +
 .../fixtures/image_component.html.erb         |  11 ++
 spec/erb_lint/fixtures/rubocop.yml            |   2 +
 7 files changed, 199 insertions(+), 11 deletions(-)
 create mode 100644 spec/erb_lint/cache_spec.rb
 create mode 100644 spec/erb_lint/fixtures/cache_file_content
 create mode 100644 spec/erb_lint/fixtures/image_component.html.erb
 create mode 100644 spec/erb_lint/fixtures/rubocop.yml

diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index 6fb0e0c0..5547da1a 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -12,9 +12,9 @@ def initialize(config, file_loader = nil)
       puts "Cache mode is on"
     end
 
-    def [](filename)
+    def get(filename, file_content)
       JSON.parse(File.read(File.join(CACHE_DIRECTORY, checksum(filename)))).map do |offense|
-        ERBLint::Offense.from_json(offense, @file_loader, config)
+        ERBLint::Offense.from_json(offense, config, @file_loader, file_content)
       end
     end
 
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 15aa2673..7d9a7a7c 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -132,7 +132,7 @@ def run_on_file(runner, filename)
     def run_using_cache(runner, filename, file_content)
       # puts cache.include?(filename)
       if cache.include?(filename) && !autocorrect?
-        runner.restore_offenses(cache[filename])
+        runner.restore_offenses(cache.get(filename, file_content))
         cache.add_hit(filename) if prune_cache?
       else
         run_with_corrections(runner, filename, file_content)
diff --git a/lib/erb_lint/offense.rb b/lib/erb_lint/offense.rb
index d730f9e4..8c306239 100644
--- a/lib/erb_lint/offense.rb
+++ b/lib/erb_lint/offense.rb
@@ -20,6 +20,8 @@ def initialize(linter, source_range, message, context = nil, severity = nil)
     def to_json_format
       {
         linter_config: linter.config.to_hash,
+        linter_config_class: linter.config.class.name,
+        linter_class: linter.class.name,
         source_range: source_range_to_json_format,
         message: message,
         context: context,
@@ -31,29 +33,29 @@ def source_range_to_json_format
       {
         begin_pos: source_range.begin_pos,
         end_pos: source_range.end_pos,
-        source_buffer_source: source_range.source_buffer.source,
         source_buffer_name: source_range.source_buffer.name,
       }
     end
 
-    def self.from_json(parsed_json, file_loader, config)
+    def self.from_json(parsed_json, config, file_loader, file_content)
       parsed_json.transform_keys!(&:to_sym)
-      linter_config = ERBLint::LinterConfig.new(parsed_json[:linter_config])
+      linter_config = const_get(parsed_json[:linter_config_class]).new(parsed_json[:linter_config])
+      linter = const_get(parsed_json[:linter_class]).new(file_loader, linter_config)
       new(
-        linter_config,
-        source_range_from_json_format(parsed_json[:source_range]),
+        linter,
+        source_range_from_json_format(parsed_json[:source_range], file_content),
         parsed_json[:message].presence,
         parsed_json[:context].presence,
-        parsed_json[:severity].presence
+        parsed_json[:severity].presence&.to_sym
       )
     end
 
-    def self.source_range_from_json_format(parsed_json_source_range)
+    def self.source_range_from_json_format(parsed_json_source_range, file_content)
       parsed_json_source_range.transform_keys!(&:to_sym)
       Parser::Source::Range.new(
         Parser::Source::Buffer.new(
           parsed_json_source_range[:source_buffer_name],
-          source: parsed_json_source_range[:source_buffer_source]
+          source: file_content
         ),
         parsed_json_source_range[:begin_pos],
         parsed_json_source_range[:end_pos]
diff --git a/spec/erb_lint/cache_spec.rb b/spec/erb_lint/cache_spec.rb
new file mode 100644
index 00000000..3f6e542f
--- /dev/null
+++ b/spec/erb_lint/cache_spec.rb
@@ -0,0 +1,172 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+require "fakefs"
+require "fakefs/spec_helpers"
+require "erb_lint/cache"
+
+require "pry"
+
+describe ERBLint::Cache do
+  include FakeFS::SpecHelpers
+
+  let(:linter_config) { ERBLint::LinterConfig.new }
+  let(:cache) { described_class.new(linter_config) }
+  let(:linted_file_path) { "app/components/elements/image_component/image_component.html.erb" }
+  let(:file_content) do
+    %()
+  end
+  let(:checksum) { "835c15465bc22783257bdafb33acc2d78c29abaa" }
+  let(:cache_dir) { ERBLint::Cache::CACHE_DIRECTORY }
+  let(:rubocop_yml) { %(SpaceAroundErbTag:\n  Enabled: true\n) }
+  let(:cache_file_content) do
+    FakeFS.deactivate!
+    content = File.read(File.expand_path("./spec/erb_lint/fixtures/cache_file_content"))
+    FakeFS.activate!
+    content
+  end
+  let(:linted_file_content) do
+    FakeFS.deactivate!
+    content = File.read(File.expand_path("./spec/erb_lint/fixtures/image_component.html.erb"))
+    FakeFS.activate!
+    content
+  end
+
+  around do |example|
+    FakeFS do
+      example.run
+    end
+  end
+
+  before do
+    FileUtils.mkdir_p(File.dirname(linted_file_path))
+    File.write(linted_file_path, linted_file_content)
+
+    FileUtils.mkdir_p(cache_dir)
+    File.open(File.join(cache_dir, checksum), "wb") do |f|
+      f.write(cache_file_content)
+    end
+
+    allow(::RuboCop::ConfigLoader).to(receive(:load_file).and_call_original)
+    allow(::RuboCop::ConfigLoader).to(receive(:read_file).and_return(rubocop_yml))
+  end
+
+  describe "#get" do
+    it "returns a cached lint result" do
+      cache_result = cache.get(linted_file_path, cache_file_content)
+      expect(cache_result.count).to(eq(2))
+    end
+  end
+
+  describe "#[]=" do
+    it "caches a lint result" do
+      cache[linted_file_path] = cache_file_content
+      expect(File.exist?(
+        File.join(
+          cache_dir,
+          checksum
+        )
+      )).to(be(true))
+    end
+  end
+
+  describe "#include?" do
+    it "returns true if the cache includes the filename" do
+      expect(cache.include?(linted_file_path)).to(be(true))
+    end
+
+    it "returns false if the cache does not include the filename" do
+      expect(cache.include?("gibberish")).to(be(false))
+    end
+  end
+
+  describe "#cache_dir_exists?" do
+    it "returns true if the cache dir exists" do
+      expect(cache.cache_dir_exists?).to(be(true))
+    end
+    it "returns false if the cache dir does not exist" do
+      FileUtils.rm_rf(cache_dir)
+      expect(cache.cache_dir_exists?).to(be(false))
+    end
+  end
+
+  describe "#clear" do
+    it "deletes the cache directory" do
+      cache.clear
+      expect(File.directory?(cache_dir)).to(be(false))
+    end
+  end
+
+  describe "#prune" do
+    it "skips prune if no cache hits" do
+      allow(cache).to(receive(:hits).and_return([]))
+
+      expect { cache.prune }.to(output(/Cache being created for the first time, skipping prune/).to_stdout)
+    end
+
+    it "does not prune actual cache hits" do
+      cache.prune
+
+      expect(File.exist?(
+        File.join(
+          cache_dir,
+          checksum
+        )
+      )).to(be(true))
+    end
+
+    it "does not prune new cache results" do
+      allow(cache).to(receive(:hits).and_return(["fake-hit"]))
+      allow(cache).to(receive(:new_results).and_return([linted_file_path]))
+      fakefs_dir = Struct.new(:fakefs_dir)
+      allow(fakefs_dir).to(receive(:children).and_return([checksum]))
+      allow(FakeFS::Dir).to(receive(:new).and_return(fakefs_dir))
+
+      expect { cache.prune }.to(output(/Skipping deletion of new cache result #{checksum} in prune/).to_stdout)
+
+      expect(File.exist?(
+        File.join(
+          cache_dir,
+          checksum
+        )
+      )).to(be(true))
+    end
+
+    it "prunes outdated cache results" do
+      fakefs_dir = Struct.new(:fakefs_dir)
+      allow(fakefs_dir).to(receive(:children).and_return([checksum, "fake-checksum"]))
+      allow(FakeFS::Dir).to(receive(:new).and_return(fakefs_dir))
+      allow(cache).to(receive(:hits).and_return([linted_file_path]))
+
+      File.open(File.join(cache_dir, "fake-checksum"), "wb") do |f|
+        f.write(cache_file_content)
+      end
+
+      expect { cache.prune }.to(output(/Cleaning deleted cached file with checksum fake-checksum/).to_stdout)
+
+      expect(File.exist?(
+        File.join(
+          cache_dir,
+          "fake-checksum"
+        )
+      )).to(be(false))
+    end
+  end
+
+  describe "#add_new_result" do
+    it "adds new result to cache object new_results attribute" do
+      cache.add_new_result(linted_file_path)
+
+      expect(cache.send(:new_results)).to(include(linted_file_path))
+    end
+  end
+
+  describe "#add_hit" do
+    it "adds new cache hit to cache object hits attribute" do
+      cache.add_hit(linted_file_path)
+
+      expect(cache.send(:hits)).to(include(linted_file_path))
+    end
+  end
+end
diff --git a/spec/erb_lint/fixtures/cache_file_content b/spec/erb_lint/fixtures/cache_file_content
new file mode 100644
index 00000000..e044f385
--- /dev/null
+++ b/spec/erb_lint/fixtures/cache_file_content
@@ -0,0 +1 @@
+[{"linter_config":{"enabled":true,"exclude":[]},"linter_config_class":"ERBLint::LinterConfig","linter_class":"ERBLint::Linters::SpaceAroundErbTag","source_range":{"begin_pos":2,"end_pos":2,"source_buffer_name":"/home/zach/dev/fake-app/app/components/elements/image_component/image_component.html.erb"},"message":"Use 1 space after `<%` instead of 0 space.","context":" ","severity":null},{"linter_config":{"enabled":true,"exclude":[]},"linter_config_class":"ERBLint::LinterConfig","linter_class":"ERBLint::Linters::SpaceAroundErbTag","source_range":{"begin_pos":172,"end_pos":172,"source_buffer_name":"/home/zach/dev/fake-app/app/components/elements/image_component/image_component.html.erb"},"message":"Use 1 space before `%>` instead of 0 space.","context":" ","severity":null}]
\ No newline at end of file
diff --git a/spec/erb_lint/fixtures/image_component.html.erb b/spec/erb_lint/fixtures/image_component.html.erb
new file mode 100644
index 00000000..a74c44ba
--- /dev/null
+++ b/spec/erb_lint/fixtures/image_component.html.erb
@@ -0,0 +1,11 @@
+<%if variable %>
+	<div>
+		<div class="relative">
+			 <%= render_image %>
+		<div class="relative top-2">
+			<%= link_to "Hello World", root_path %>
+		</div>
+	</div>
+<% else%>
+	<%= render_image %>
+<% end %>
\ No newline at end of file
diff --git a/spec/erb_lint/fixtures/rubocop.yml b/spec/erb_lint/fixtures/rubocop.yml
new file mode 100644
index 00000000..fc768c91
--- /dev/null
+++ b/spec/erb_lint/fixtures/rubocop.yml
@@ -0,0 +1,2 @@
+SpaceAroundErbTag:
+  Enabled: true

From fbbcd2a218c831a0d7c33e645dcecb131ceba5df Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Sun, 14 Aug 2022 20:15:37 -0400
Subject: [PATCH 08/85] Clean up

---
 Gemfile                     | 1 -
 Gemfile.lock                | 6 ------
 lib/erb_lint/cli.rb         | 1 -
 spec/erb_lint/cache_spec.rb | 8 +-------
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3ef7f8e2..548e391e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "pry"
 
 group "test" do
   gem "fakefs"
diff --git a/Gemfile.lock b/Gemfile.lock
index b5d2ec89..72c45979 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,7 +32,6 @@ GEM
       parser (>= 2.4)
       smart_properties
     builder (3.2.4)
-    coderay (1.1.3)
     concurrent-ruby (1.1.10)
     crass (1.0.6)
     diff-lcs (1.5.0)
@@ -43,7 +42,6 @@ GEM
     loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    method_source (1.0.0)
     mini_portile2 (2.8.0)
     minitest (5.16.3)
     nokogiri (1.13.8)
@@ -52,9 +50,6 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
     racc (1.6.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -103,7 +98,6 @@ PLATFORMS
 DEPENDENCIES
   erb_lint!
   fakefs
-  pry
   rake
   rspec
   rubocop
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 7d9a7a7c..d811f9a9 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -130,7 +130,6 @@ def run_on_file(runner, filename)
     end
 
     def run_using_cache(runner, filename, file_content)
-      # puts cache.include?(filename)
       if cache.include?(filename) && !autocorrect?
         runner.restore_offenses(cache.get(filename, file_content))
         cache.add_hit(filename) if prune_cache?
diff --git a/spec/erb_lint/cache_spec.rb b/spec/erb_lint/cache_spec.rb
index 3f6e542f..a4098dc9 100644
--- a/spec/erb_lint/cache_spec.rb
+++ b/spec/erb_lint/cache_spec.rb
@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-
+require "erb_lint/cache"
 require "fakefs"
 require "fakefs/spec_helpers"
-require "erb_lint/cache"
-
-require "pry"
 
 describe ERBLint::Cache do
   include FakeFS::SpecHelpers
@@ -14,9 +11,6 @@
   let(:linter_config) { ERBLint::LinterConfig.new }
   let(:cache) { described_class.new(linter_config) }
   let(:linted_file_path) { "app/components/elements/image_component/image_component.html.erb" }
-  let(:file_content) do
-    %()
-  end
   let(:checksum) { "835c15465bc22783257bdafb33acc2d78c29abaa" }
   let(:cache_dir) { ERBLint::Cache::CACHE_DIRECTORY }
   let(:rubocop_yml) { %(SpaceAroundErbTag:\n  Enabled: true\n) }

From a292ef095c4726ea437d6034bee9f6df2d579e6f Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Thu, 18 Aug 2022 20:13:26 -0400
Subject: [PATCH 09/85] Include ERBLint version in cache key

---
 lib/erb_lint/cache.rb       | 2 +-
 spec/erb_lint/cache_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index 5547da1a..a2760e0d 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -82,7 +82,7 @@ def checksum(file)
       mode = File.stat(file).mode
 
       digester.update(
-        "#{file}#{mode}#{config.to_hash}"
+        "#{file}#{mode}#{config.to_hash}#{ERBLint::VERSION}"
       )
       digester.file(file)
       digester.hexdigest
diff --git a/spec/erb_lint/cache_spec.rb b/spec/erb_lint/cache_spec.rb
index a4098dc9..ce7dde19 100644
--- a/spec/erb_lint/cache_spec.rb
+++ b/spec/erb_lint/cache_spec.rb
@@ -11,7 +11,7 @@
   let(:linter_config) { ERBLint::LinterConfig.new }
   let(:cache) { described_class.new(linter_config) }
   let(:linted_file_path) { "app/components/elements/image_component/image_component.html.erb" }
-  let(:checksum) { "835c15465bc22783257bdafb33acc2d78c29abaa" }
+  let(:checksum) { "2dc3e17183b87889cc783b0157723570d4bbb90a" }
   let(:cache_dir) { ERBLint::Cache::CACHE_DIRECTORY }
   let(:rubocop_yml) { %(SpaceAroundErbTag:\n  Enabled: true\n) }
   let(:cache_file_content) do

From be113700428906b82974c02a50c42a342c87f397 Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Thu, 18 Aug 2022 20:19:23 -0400
Subject: [PATCH 10/85] Fix nonsensical error message

---
 lib/erb_lint/cli.rb       | 2 +-
 spec/erb_lint/cli_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index d811f9a9..1644e712 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -45,7 +45,7 @@ def run(args = ARGV)
           cache.clear
           success!("cache directory cleared")
         else
-          failure!("cache directory already doesn't exist, skipped deletion.")
+          failure!("cache directory doesn't exist, skipping deletion.")
         end
       end
 
diff --git a/spec/erb_lint/cli_spec.rb b/spec/erb_lint/cli_spec.rb
index d282b131..25395dcc 100644
--- a/spec/erb_lint/cli_spec.rb
+++ b/spec/erb_lint/cli_spec.rb
@@ -101,7 +101,7 @@ def run(processed_source)
     context "with --clear-cache" do
       let(:args) { ["--clear-cache"] }
       context "without a cache folder" do
-        it { expect { subject }.to(output(/cache directory already doesn't exist, skipped deletion/).to_stderr) }
+        it { expect { subject }.to(output(/cache directory doesn't exist, skipping deletion/).to_stderr) }
         it "shows cache not cleared message if cache is empty and fails" do
           expect(subject).to(be(false))
         end

From deeb4f80efd8d7a33d33bbdadeee3c9376d77579 Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Thu, 18 Aug 2022 20:31:46 -0400
Subject: [PATCH 11/85] Spacing fixes and removing unneeded code

---
 lib/erb_lint/cli.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 1644e712..016c370d 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -40,6 +40,7 @@ def run(args = ARGV)
       load_config
 
       @cache = Cache.new(@config, file_loader) if with_cache? || clear_cache?
+
       if clear_cache?
         if cache.cache_dir_exists?
           cache.clear
@@ -120,17 +121,19 @@ def run(args = ARGV)
 
     def run_on_file(runner, filename)
       file_content = read_content(filename)
+
       if with_cache? && !autocorrect?
         run_using_cache(runner, filename, file_content)
       else
         file_content = run_with_corrections(runner, filename, file_content)
       end
+
       log_offense_stats(runner, filename)
       file_content
     end
 
     def run_using_cache(runner, filename, file_content)
-      if cache.include?(filename) && !autocorrect?
+      if cache.include?(filename)
         runner.restore_offenses(cache.get(filename, file_content))
         cache.add_hit(filename) if prune_cache?
       else

From 1a5db058f820ec6c40bbcda0e423aff0d42a86c0 Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Fri, 19 Aug 2022 22:11:12 -0400
Subject: [PATCH 12/85] Fix tests by mocking returned checksum

---
 spec/erb_lint/cache_spec.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/spec/erb_lint/cache_spec.rb b/spec/erb_lint/cache_spec.rb
index ce7dde19..5651cf20 100644
--- a/spec/erb_lint/cache_spec.rb
+++ b/spec/erb_lint/cache_spec.rb
@@ -42,8 +42,11 @@
       f.write(cache_file_content)
     end
 
-    allow(::RuboCop::ConfigLoader).to(receive(:load_file).and_call_original)
-    allow(::RuboCop::ConfigLoader).to(receive(:read_file).and_return(rubocop_yml))
+    digest_sha1_double = instance_double(Digest::SHA1)
+    allow(Digest::SHA1).to(receive(:new).and_return(digest_sha1_double))
+    allow(digest_sha1_double).to(receive(:hexdigest).and_return(checksum))
+    allow(digest_sha1_double).to(receive(:update).and_return(true))
+    allow(digest_sha1_double).to(receive(:file).and_return(true))
   end
 
   describe "#get" do
@@ -127,7 +130,7 @@
       )).to(be(true))
     end
 
-    it "prunes outdated cache results" do
+    it "prunes unused cache results" do
       fakefs_dir = Struct.new(:fakefs_dir)
       allow(fakefs_dir).to(receive(:children).and_return([checksum, "fake-checksum"]))
       allow(FakeFS::Dir).to(receive(:new).and_return(fakefs_dir))

From 8d4eaa86662ba9c34bf90259168cdda7a83660a1 Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Sat, 8 Oct 2022 14:07:56 -0400
Subject: [PATCH 13/85] Move cache pruning to the cache class

---
 lib/erb_lint/cache.rb       | 24 +++++++++++++++---------
 lib/erb_lint/cli.rb         |  6 ++----
 spec/erb_lint/cache_spec.rb | 34 ++++++++++++++++++++++------------
 3 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index a2760e0d..425cc801 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -4,15 +4,18 @@ module ERBLint
   class Cache
     CACHE_DIRECTORY = ".erb-lint-cache"
 
-    def initialize(config, file_loader = nil)
+    def initialize(config, file_loader = nil, prune = false)
       @config = config
       @file_loader = file_loader
       @hits = []
       @new_results = []
+      @prune = prune
       puts "Cache mode is on"
     end
 
     def get(filename, file_content)
+      @hits.push(filename) if prune?
+
       JSON.parse(File.read(File.join(CACHE_DIRECTORY, checksum(filename)))).map do |offense|
         ERBLint::Offense.from_json(offense, config, @file_loader, file_content)
       end
@@ -23,6 +26,8 @@ def include?(filename)
     end
 
     def []=(filename, offenses_as_json)
+      @new_results.push(filename) if prune?
+
       FileUtils.mkdir_p(CACHE_DIRECTORY)
 
       File.open(File.join(CACHE_DIRECTORY, checksum(filename)), "wb") do |f|
@@ -30,15 +35,12 @@ def []=(filename, offenses_as_json)
       end
     end
 
-    def add_hit(hit)
-      @hits.push(hit)
-    end
-
-    def add_new_result(filename)
-      @new_results.push(filename)
+    def close
+      prune_cache if prune?
     end
 
-    def prune
+    def prune_cache
+      puts "Prune cache mode is on - pruned file names will be logged"
       if hits.empty?
         puts "Cache being created for the first time, skipping prune"
         return
@@ -51,7 +53,7 @@ def prune
         next if hits_as_checksums.include?(cache_file)
 
         if new_results_as_checksums.include?(cache_file)
-          puts "Skipping deletion of new cache result #{cache_file} in prune"
+          puts "Skipping deletion of new cache result #{cache_file}"
           next
         end
 
@@ -91,5 +93,9 @@ def checksum(file)
       # here.
       "_"
     end
+
+    def prune?
+      @prune
+    end
   end
 end
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 016c370d..272bf2ad 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -39,7 +39,7 @@ def run(args = ARGV)
 
       load_config
 
-      @cache = Cache.new(@config, file_loader) if with_cache? || clear_cache?
+      @cache = Cache.new(@config, file_loader, prune_cache?) if with_cache? || clear_cache?
 
       if clear_cache?
         if cache.cache_dir_exists?
@@ -93,7 +93,7 @@ def run(args = ARGV)
         end
       end
 
-      cache.prune if prune_cache?
+      cache.close if with_cache? || clear_cache?
 
       reporter.show
 
@@ -135,11 +135,9 @@ def run_on_file(runner, filename)
     def run_using_cache(runner, filename, file_content)
       if cache.include?(filename)
         runner.restore_offenses(cache.get(filename, file_content))
-        cache.add_hit(filename) if prune_cache?
       else
         run_with_corrections(runner, filename, file_content)
         cache[filename] = runner.offenses.map(&:to_json_format).to_json
-        cache.add_new_result(filename) if prune_cache?
       end
     end
 
diff --git a/spec/erb_lint/cache_spec.rb b/spec/erb_lint/cache_spec.rb
index 5651cf20..b30f238a 100644
--- a/spec/erb_lint/cache_spec.rb
+++ b/spec/erb_lint/cache_spec.rb
@@ -95,15 +95,15 @@
     end
   end
 
-  describe "#prune" do
+  describe "#prune_cache" do
     it "skips prune if no cache hits" do
       allow(cache).to(receive(:hits).and_return([]))
 
-      expect { cache.prune }.to(output(/Cache being created for the first time, skipping prune/).to_stdout)
+      expect { cache.prune_cache }.to(output(/Cache being created for the first time, skipping prune/).to_stdout)
     end
 
     it "does not prune actual cache hits" do
-      cache.prune
+      cache.prune_cache
 
       expect(File.exist?(
         File.join(
@@ -120,7 +120,7 @@
       allow(fakefs_dir).to(receive(:children).and_return([checksum]))
       allow(FakeFS::Dir).to(receive(:new).and_return(fakefs_dir))
 
-      expect { cache.prune }.to(output(/Skipping deletion of new cache result #{checksum} in prune/).to_stdout)
+      expect { cache.prune_cache }.to(output(/Skipping deletion of new cache result #{checksum}/).to_stdout)
 
       expect(File.exist?(
         File.join(
@@ -140,7 +140,7 @@
         f.write(cache_file_content)
       end
 
-      expect { cache.prune }.to(output(/Cleaning deleted cached file with checksum fake-checksum/).to_stdout)
+      expect { cache.prune_cache }.to(output(/Cleaning deleted cached file with checksum fake-checksum/).to_stdout)
 
       expect(File.exist?(
         File.join(
@@ -151,19 +151,29 @@
     end
   end
 
-  describe "#add_new_result" do
-    it "adds new result to cache object new_results attribute" do
-      cache.add_new_result(linted_file_path)
+  describe "prune cache mode on #get and #[] behavior" do
+    before do
+      allow(cache).to(receive(:prune?).and_return(true))
+    end
+
+    it "adds new result to cache object new_results list attribute" do
+      cache[linted_file_path] = cache_file_content
 
       expect(cache.send(:new_results)).to(include(linted_file_path))
     end
-  end
 
-  describe "#add_hit" do
-    it "adds new cache hit to cache object hits attribute" do
-      cache.add_hit(linted_file_path)
+    it "adds new cache hit to cache object hits list attribute" do
+      cache.get(linted_file_path, linted_file_content)
 
       expect(cache.send(:hits)).to(include(linted_file_path))
     end
   end
+
+  describe "#close" do
+    it "Calls prune_cache if prune_cache mode is on" do
+      allow(cache).to(receive(:prune?).and_return(true))
+      expect(cache).to(receive(:prune_cache))
+      cache.close
+    end
+  end
 end

From cdf089ccb2d92a8dbfc2cf179d3dcd9c7a70f5b9 Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Sat, 8 Oct 2022 16:01:57 -0400
Subject: [PATCH 14/85] Do less file reads and stats

---
 lib/erb_lint/cache.rb       | 39 +++++++++++++++++++------------------
 lib/erb_lint/cli.rb         |  6 +++---
 spec/erb_lint/cache_spec.rb | 24 +++++++----------------
 3 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index 425cc801..ee8fb639 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -14,23 +14,27 @@ def initialize(config, file_loader = nil, prune = false)
     end
 
     def get(filename, file_content)
-      @hits.push(filename) if prune?
-
-      JSON.parse(File.read(File.join(CACHE_DIRECTORY, checksum(filename)))).map do |offense|
-        ERBLint::Offense.from_json(offense, config, @file_loader, file_content)
+      file_checksum = checksum(filename, file_content)
+      begin
+        cache_file_contents_as_offenses = JSON.parse(
+          File.read(File.join(CACHE_DIRECTORY, file_checksum))
+        ).map do |offense|
+          ERBLint::Offense.from_json(offense, config, @file_loader, file_content)
+        end
+      rescue Errno::ENOENT
+        return false
       end
+      @hits.push(file_checksum) if prune?
+      cache_file_contents_as_offenses
     end
 
-    def include?(filename)
-      File.exist?(File.join(CACHE_DIRECTORY, checksum(filename)))
-    end
-
-    def []=(filename, offenses_as_json)
-      @new_results.push(filename) if prune?
+    def set(filename, file_content, offenses_as_json)
+      file_checksum = checksum(filename, file_content)
+      @new_results.push(file_checksum) if prune?
 
       FileUtils.mkdir_p(CACHE_DIRECTORY)
 
-      File.open(File.join(CACHE_DIRECTORY, checksum(filename)), "wb") do |f|
+      File.open(File.join(CACHE_DIRECTORY, file_checksum), "wb") do |f|
         f.write(offenses_as_json)
       end
     end
@@ -47,12 +51,10 @@ def prune_cache
       end
 
       cache_files = Dir.new(CACHE_DIRECTORY).children
-      hits_as_checksums = hits.map { |hit| checksum(hit) }
-      new_results_as_checksums = new_results.map { |new_result| checksum(new_result) }
       cache_files.each do |cache_file|
-        next if hits_as_checksums.include?(cache_file)
+        next if hits.include?(cache_file)
 
-        if new_results_as_checksums.include?(cache_file)
+        if new_results.include?(cache_file)
           puts "Skipping deletion of new cache result #{cache_file}"
           next
         end
@@ -79,14 +81,13 @@ def clear
 
     attr_reader :config, :hits, :new_results
 
-    def checksum(file)
+    def checksum(filename, file_content)
       digester = Digest::SHA1.new
-      mode = File.stat(file).mode
+      mode = File.stat(filename).mode
 
       digester.update(
-        "#{file}#{mode}#{config.to_hash}#{ERBLint::VERSION}"
+        "#{mode}#{config.to_hash}#{ERBLint::VERSION}#{file_content}"
       )
-      digester.file(file)
       digester.hexdigest
     rescue Errno::ENOENT
       # Spurious files that come and go should not cause a crash, at least not
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 272bf2ad..7cedf1df 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -133,11 +133,11 @@ def run_on_file(runner, filename)
     end
 
     def run_using_cache(runner, filename, file_content)
-      if cache.include?(filename)
-        runner.restore_offenses(cache.get(filename, file_content))
+      if (cache_result_offenses = cache.get(filename, file_content))
+        runner.restore_offenses(cache_result_offenses)
       else
         run_with_corrections(runner, filename, file_content)
-        cache[filename] = runner.offenses.map(&:to_json_format).to_json
+        cache.set(filename, file_content, runner.offenses.map(&:to_json_format).to_json)
       end
     end
 
diff --git a/spec/erb_lint/cache_spec.rb b/spec/erb_lint/cache_spec.rb
index b30f238a..141ccb75 100644
--- a/spec/erb_lint/cache_spec.rb
+++ b/spec/erb_lint/cache_spec.rb
@@ -51,14 +51,14 @@
 
   describe "#get" do
     it "returns a cached lint result" do
-      cache_result = cache.get(linted_file_path, cache_file_content)
+      cache_result = cache.get(linted_file_path, linted_file_content)
       expect(cache_result.count).to(eq(2))
     end
   end
 
   describe "#[]=" do
     it "caches a lint result" do
-      cache[linted_file_path] = cache_file_content
+      cache.set(linted_file_path, linted_file_content, cache_file_content)
       expect(File.exist?(
         File.join(
           cache_dir,
@@ -68,16 +68,6 @@
     end
   end
 
-  describe "#include?" do
-    it "returns true if the cache includes the filename" do
-      expect(cache.include?(linted_file_path)).to(be(true))
-    end
-
-    it "returns false if the cache does not include the filename" do
-      expect(cache.include?("gibberish")).to(be(false))
-    end
-  end
-
   describe "#cache_dir_exists?" do
     it "returns true if the cache dir exists" do
       expect(cache.cache_dir_exists?).to(be(true))
@@ -115,12 +105,12 @@
 
     it "does not prune new cache results" do
       allow(cache).to(receive(:hits).and_return(["fake-hit"]))
-      allow(cache).to(receive(:new_results).and_return([linted_file_path]))
+      allow(cache).to(receive(:new_results).and_return([checksum]))
       fakefs_dir = Struct.new(:fakefs_dir)
       allow(fakefs_dir).to(receive(:children).and_return([checksum]))
       allow(FakeFS::Dir).to(receive(:new).and_return(fakefs_dir))
 
-      expect { cache.prune_cache }.to(output(/Skipping deletion of new cache result #{checksum}/).to_stdout)
+      expect { cache.prune_cache }.to(output(/.*Skipping deletion of new cache result #{checksum}/).to_stdout)
 
       expect(File.exist?(
         File.join(
@@ -157,15 +147,15 @@
     end
 
     it "adds new result to cache object new_results list attribute" do
-      cache[linted_file_path] = cache_file_content
+      cache.set(linted_file_path, linted_file_content, cache_file_content)
 
-      expect(cache.send(:new_results)).to(include(linted_file_path))
+      expect(cache.send(:new_results)).to(include(checksum))
     end
 
     it "adds new cache hit to cache object hits list attribute" do
       cache.get(linted_file_path, linted_file_content)
 
-      expect(cache.send(:hits)).to(include(linted_file_path))
+      expect(cache.send(:hits)).to(include(checksum))
     end
   end
 

From b331799a1a0543d29cdbf33a94a7a7da871a90c3 Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Mon, 10 Oct 2022 15:48:52 -0400
Subject: [PATCH 15/85] Attempt a new implementation for storing offenses in a
 CachedOffense for speed

---
 lib/erb_lint/all.rb                       |  1 +
 lib/erb_lint/cache.rb                     |  2 +-
 lib/erb_lint/cached_offense.rb            | 39 ++++++++++++++++++++
 lib/erb_lint/cli.rb                       |  2 +-
 lib/erb_lint/offense.rb                   | 45 +----------------------
 spec/erb_lint/fixtures/cache_file_content |  2 +-
 6 files changed, 45 insertions(+), 46 deletions(-)
 create mode 100644 lib/erb_lint/cached_offense.rb

diff --git a/lib/erb_lint/all.rb b/lib/erb_lint/all.rb
index 8280343a..4aee601c 100644
--- a/lib/erb_lint/all.rb
+++ b/lib/erb_lint/all.rb
@@ -4,6 +4,7 @@
 
 require "erb_lint"
 require "erb_lint/cache"
+require "erb_lint/cached_offense"
 require "erb_lint/corrector"
 require "erb_lint/file_loader"
 require "erb_lint/linter_config"
diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index ee8fb639..73d1f42c 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -19,7 +19,7 @@ def get(filename, file_content)
         cache_file_contents_as_offenses = JSON.parse(
           File.read(File.join(CACHE_DIRECTORY, file_checksum))
         ).map do |offense|
-          ERBLint::Offense.from_json(offense, config, @file_loader, file_content)
+          ERBLint::CachedOffense.from_json(offense)
         end
       rescue Errno::ENOENT
         return false
diff --git a/lib/erb_lint/cached_offense.rb b/lib/erb_lint/cached_offense.rb
new file mode 100644
index 00000000..7710d332
--- /dev/null
+++ b/lib/erb_lint/cached_offense.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module ERBLint
+  # A Cached version of an Offense with only essential information represented as strings
+  class CachedOffense
+    attr_reader :line_number, :message, :severity
+
+    def initialize(message, line_number, severity)
+      @message = message
+      @line_number = line_number
+      @severity = severity
+    end
+
+    def self.new_from_offense(offense)
+      new(
+        offense.message,
+        offense.line_number.to_s,
+        offense.severity
+      )
+    end
+
+    def to_json_format
+      {
+        message: message,
+        line_number: line_number,
+        severity: severity,
+      }
+    end
+
+    def self.from_json(parsed_json)
+      parsed_json.transform_keys!(&:to_sym)
+      new(
+        parsed_json[:message],
+        parsed_json[:line_number],
+        parsed_json[:severity].to_sym
+      )
+    end
+  end
+end
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 7cedf1df..d317c048 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -137,7 +137,7 @@ def run_using_cache(runner, filename, file_content)
         runner.restore_offenses(cache_result_offenses)
       else
         run_with_corrections(runner, filename, file_content)
-        cache.set(filename, file_content, runner.offenses.map(&:to_json_format).to_json)
+        cache.set(filename, file_content, runner.offenses.map(&:to_cached_offense_json_format).to_json)
       end
     end
 
diff --git a/lib/erb_lint/offense.rb b/lib/erb_lint/offense.rb
index 8c306239..9e76bcb5 100644
--- a/lib/erb_lint/offense.rb
+++ b/lib/erb_lint/offense.rb
@@ -17,49 +17,8 @@ def initialize(linter, source_range, message, context = nil, severity = nil)
       @severity = severity
     end
 
-    def to_json_format
-      {
-        linter_config: linter.config.to_hash,
-        linter_config_class: linter.config.class.name,
-        linter_class: linter.class.name,
-        source_range: source_range_to_json_format,
-        message: message,
-        context: context,
-        severity: severity,
-      }
-    end
-
-    def source_range_to_json_format
-      {
-        begin_pos: source_range.begin_pos,
-        end_pos: source_range.end_pos,
-        source_buffer_name: source_range.source_buffer.name,
-      }
-    end
-
-    def self.from_json(parsed_json, config, file_loader, file_content)
-      parsed_json.transform_keys!(&:to_sym)
-      linter_config = const_get(parsed_json[:linter_config_class]).new(parsed_json[:linter_config])
-      linter = const_get(parsed_json[:linter_class]).new(file_loader, linter_config)
-      new(
-        linter,
-        source_range_from_json_format(parsed_json[:source_range], file_content),
-        parsed_json[:message].presence,
-        parsed_json[:context].presence,
-        parsed_json[:severity].presence&.to_sym
-      )
-    end
-
-    def self.source_range_from_json_format(parsed_json_source_range, file_content)
-      parsed_json_source_range.transform_keys!(&:to_sym)
-      Parser::Source::Range.new(
-        Parser::Source::Buffer.new(
-          parsed_json_source_range[:source_buffer_name],
-          source: file_content
-        ),
-        parsed_json_source_range[:begin_pos],
-        parsed_json_source_range[:end_pos]
-      )
+    def to_cached_offense_json_format
+      ERBLint::CachedOffense.new_from_offense(self).to_json_format
     end
 
     def inspect
diff --git a/spec/erb_lint/fixtures/cache_file_content b/spec/erb_lint/fixtures/cache_file_content
index e044f385..62945f92 100644
--- a/spec/erb_lint/fixtures/cache_file_content
+++ b/spec/erb_lint/fixtures/cache_file_content
@@ -1 +1 @@
-[{"linter_config":{"enabled":true,"exclude":[]},"linter_config_class":"ERBLint::LinterConfig","linter_class":"ERBLint::Linters::SpaceAroundErbTag","source_range":{"begin_pos":2,"end_pos":2,"source_buffer_name":"/home/zach/dev/fake-app/app/components/elements/image_component/image_component.html.erb"},"message":"Use 1 space after `<%` instead of 0 space.","context":" ","severity":null},{"linter_config":{"enabled":true,"exclude":[]},"linter_config_class":"ERBLint::LinterConfig","linter_class":"ERBLint::Linters::SpaceAroundErbTag","source_range":{"begin_pos":172,"end_pos":172,"source_buffer_name":"/home/zach/dev/fake-app/app/components/elements/image_component/image_component.html.erb"},"message":"Use 1 space before `%>` instead of 0 space.","context":" ","severity":null}]
\ No newline at end of file
+[{"message":"Layout/InitialIndentation: Indentation of first line in file detected.","line_number":"1","severity":"convention"},{"message":"Layout/TrailingEmptyLines: Final newline missing.","line_number":"1","severity":"convention"}]
\ No newline at end of file

From ce8d6da6d4d51cc460930bc905564485fd1f357a Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Tue, 11 Oct 2022 21:32:40 -0400
Subject: [PATCH 16/85] Update lib/erb_lint/cached_offense.rb to avoid errors
 on nil severity

Co-authored-by: Eric Terry <eterry1388@aol.com>
---
 lib/erb_lint/cached_offense.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/erb_lint/cached_offense.rb b/lib/erb_lint/cached_offense.rb
index 7710d332..4a726934 100644
--- a/lib/erb_lint/cached_offense.rb
+++ b/lib/erb_lint/cached_offense.rb
@@ -32,7 +32,7 @@ def self.from_json(parsed_json)
       new(
         parsed_json[:message],
         parsed_json[:line_number],
-        parsed_json[:severity].to_sym
+        parsed_json[:severity]&.to_sym
       )
     end
   end

From acba4a9011cf3e2e0479af0f77804030a14dd163 Mon Sep 17 00:00:00 2001
From: Eric Terry <eterry1388@aol.com>
Date: Tue, 11 Oct 2022 23:56:52 -0500
Subject: [PATCH 17/85] Support caching with json and compact reporters

---
 lib/erb_lint/cache.rb                         |  4 +-
 lib/erb_lint/cached_offense.rb                | 55 +++++++++++++------
 lib/erb_lint/cli.rb                           |  2 +-
 lib/erb_lint/offense.rb                       | 20 ++++++-
 lib/erb_lint/reporters/json_reporter.rb       |  8 +--
 spec/erb_lint/fixtures/cache_file_content     |  2 +-
 spec/erb_lint/reporters/json_reporter_spec.rb | 22 +++-----
 7 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index 73d1f42c..79b88a81 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -18,8 +18,8 @@ def get(filename, file_content)
       begin
         cache_file_contents_as_offenses = JSON.parse(
           File.read(File.join(CACHE_DIRECTORY, file_checksum))
-        ).map do |offense|
-          ERBLint::CachedOffense.from_json(offense)
+        ).map do |offense_hash|
+          ERBLint::CachedOffense.new(offense_hash)
         end
       rescue Errno::ENOENT
         return false
diff --git a/lib/erb_lint/cached_offense.rb b/lib/erb_lint/cached_offense.rb
index 4a726934..3c5fa74e 100644
--- a/lib/erb_lint/cached_offense.rb
+++ b/lib/erb_lint/cached_offense.rb
@@ -3,37 +3,56 @@
 module ERBLint
   # A Cached version of an Offense with only essential information represented as strings
   class CachedOffense
-    attr_reader :line_number, :message, :severity
+    attr_reader(
+      :message,
+      :line_number,
+      :severity,
+      :column,
+      :simple_name,
+      :last_line,
+      :last_column,
+      :length,
+    )
 
-    def initialize(message, line_number, severity)
-      @message = message
-      @line_number = line_number
-      @severity = severity
+    def initialize(params)
+      params = params.transform_keys(&:to_sym)
+
+      @message = params[:message]
+      @line_number = params[:line_number]
+      @severity = params[:severity]&.to_sym
+      @column = params[:column]
+      @simple_name = params[:simple_name]
+      @last_line = params[:last_line]
+      @last_column = params[:last_column]
+      @length = params[:length]
     end
 
     def self.new_from_offense(offense)
       new(
-        offense.message,
-        offense.line_number.to_s,
-        offense.severity
+        {
+          message: offense.message,
+          line_number: offense.line_number,
+          severity: offense.severity,
+          column: offense.column,
+          simple_name: offense.simple_name,
+          last_line: offense.last_line,
+          last_column: offense.last_column,
+          length: offense.length,
+        }
       )
     end
 
-    def to_json_format
+    def to_h
       {
         message: message,
         line_number: line_number,
         severity: severity,
+        column: column,
+        simple_name: simple_name,
+        last_line: last_line,
+        last_column: last_column,
+        length: length,
       }
     end
-
-    def self.from_json(parsed_json)
-      parsed_json.transform_keys!(&:to_sym)
-      new(
-        parsed_json[:message],
-        parsed_json[:line_number],
-        parsed_json[:severity]&.to_sym
-      )
-    end
   end
 end
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index d317c048..72b8c131 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -137,7 +137,7 @@ def run_using_cache(runner, filename, file_content)
         runner.restore_offenses(cache_result_offenses)
       else
         run_with_corrections(runner, filename, file_content)
-        cache.set(filename, file_content, runner.offenses.map(&:to_cached_offense_json_format).to_json)
+        cache.set(filename, file_content, runner.offenses.map(&:to_cached_offense_hash).to_json)
       end
     end
 
diff --git a/lib/erb_lint/offense.rb b/lib/erb_lint/offense.rb
index 9e76bcb5..5c8db6b7 100644
--- a/lib/erb_lint/offense.rb
+++ b/lib/erb_lint/offense.rb
@@ -17,8 +17,8 @@ def initialize(linter, source_range, message, context = nil, severity = nil)
       @severity = severity
     end
 
-    def to_cached_offense_json_format
-      ERBLint::CachedOffense.new_from_offense(self).to_json_format
+    def to_cached_offense_hash
+      ERBLint::CachedOffense.new_from_offense(self).to_h
     end
 
     def inspect
@@ -47,5 +47,21 @@ def line_number
     def column
       source_range.column
     end
+
+    def simple_name
+      linter.class.simple_name
+    end
+
+    def last_line
+      source_range.last_line
+    end
+
+    def last_column
+      source_range.last_column
+    end
+
+    def length
+      source_range.length
+    end
   end
 end
diff --git a/lib/erb_lint/reporters/json_reporter.rb b/lib/erb_lint/reporters/json_reporter.rb
index c3f937f2..2abf35e7 100644
--- a/lib/erb_lint/reporters/json_reporter.rb
+++ b/lib/erb_lint/reporters/json_reporter.rb
@@ -56,14 +56,14 @@ def formatted_offenses(offenses)
 
       def format_offense(offense)
         {
-          linter: offense.linter.class.simple_name,
+          linter: offense.simple_name,
           message: offense.message.to_s,
           location: {
             start_line: offense.line_number,
             start_column: offense.column,
-            last_line: offense.source_range.last_line,
-            last_column: offense.source_range.last_column,
-            length: offense.source_range.length,
+            last_line: offense.last_line,
+            last_column: offense.last_column,
+            length: offense.length,
           },
         }
       end
diff --git a/spec/erb_lint/fixtures/cache_file_content b/spec/erb_lint/fixtures/cache_file_content
index 62945f92..20d5f8d6 100644
--- a/spec/erb_lint/fixtures/cache_file_content
+++ b/spec/erb_lint/fixtures/cache_file_content
@@ -1 +1 @@
-[{"message":"Layout/InitialIndentation: Indentation of first line in file detected.","line_number":"1","severity":"convention"},{"message":"Layout/TrailingEmptyLines: Final newline missing.","line_number":"1","severity":"convention"}]
\ No newline at end of file
+[{"message":"Layout/InitialIndentation: Indentation of first line in file detected.","line_number":"1","severity":"convention","line_number":"1","severity":"convention","column":"3","simple_name":"Rubocop","last_line":"1","last_column":"8","length":"5"},{"message":"Layout/TrailingEmptyLines: Final newline missing.","line_number":"1","severity":"convention","line_number":"1","severity":"convention","column":"3","simple_name":"Rubocop","last_line":"1","last_column":"8","length":"5"}]
diff --git a/spec/erb_lint/reporters/json_reporter_spec.rb b/spec/erb_lint/reporters/json_reporter_spec.rb
index 9119ab0f..d5b62d0b 100644
--- a/spec/erb_lint/reporters/json_reporter_spec.rb
+++ b/spec/erb_lint/reporters/json_reporter_spec.rb
@@ -23,26 +23,20 @@
           message: "Extra space detected where there should be no space.",
           line_number: 1,
           column: 7,
-          source_range: instance_double(
-            BetterHtml::Tokenizer::Location,
-            last_line: 1,
-            last_column: 9,
-            length: 2,
-          ),
-          linter: ERBLint::Linters::SpaceInHtmlTag.new(nil, ERBLint::LinterConfig.new),
+          simple_name: "SpaceInHtmlTag",
+          last_line: 1,
+          last_column: 9,
+          length: 2,
         ),
         instance_double(
           ERBLint::Offense,
           message: "Remove newline before `%>` to match start of tag.",
           line_number: 52,
           column: 10,
-          source_range: instance_double(
-            BetterHtml::Tokenizer::Location,
-            last_line: 54,
-            last_column: 10,
-            length: 10,
-          ),
-          linter: ERBLint::Linters::ClosingErbTagIndent.new(nil, ERBLint::LinterConfig.new),
+          simple_name: "ClosingErbTagIndent",
+          last_line: 54,
+          last_column: 10,
+          length: 10,
         ),
       ]
     end

From 9ec34e399cfd366d5fa6fec2214715a7e57fc97f Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Thu, 13 Oct 2022 07:41:30 -0400
Subject: [PATCH 18/85] Update lib/erb_lint/cli.rb to use safe navigation
 operator
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Étienne Barrié <etienne.barrie@gmail.com>
---
 lib/erb_lint/cli.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 72b8c131..576b6df0 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -93,7 +93,7 @@ def run(args = ARGV)
         end
       end
 
-      cache.close if with_cache? || clear_cache?
+      cache&.close
 
       reporter.show
 

From 877c28cfedb14d0cd51ac109aaa3ae6158ee9542 Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Thu, 13 Oct 2022 07:44:34 -0400
Subject: [PATCH 19/85] Rename with-cache to cache

---
 lib/erb_lint/cli.rb       | 14 +++++++-------
 spec/erb_lint/cli_spec.rb |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 576b6df0..ae11f391 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -31,7 +31,7 @@ def run(args = ARGV)
       dupped_args = args.dup
       load_options(dupped_args)
 
-      if with_cache? && autocorrect?
+      if cache? && autocorrect?
         failure!("cannot run autocorrect mode with cache")
       end
 
@@ -39,7 +39,7 @@ def run(args = ARGV)
 
       load_config
 
-      @cache = Cache.new(@config, file_loader, prune_cache?) if with_cache? || clear_cache?
+      @cache = Cache.new(@config, file_loader, prune_cache?) if cache? || clear_cache?
 
       if clear_cache?
         if cache.cache_dir_exists?
@@ -122,7 +122,7 @@ def run(args = ARGV)
     def run_on_file(runner, filename)
       file_content = read_content(filename)
 
-      if with_cache? && !autocorrect?
+      if cache? && !autocorrect?
         run_using_cache(runner, filename, file_content)
       else
         file_content = run_with_corrections(runner, filename, file_content)
@@ -145,8 +145,8 @@ def autocorrect?
       @options[:autocorrect]
     end
 
-    def with_cache?
-      @options[:with_cache]
+    def cache?
+      @options[:cache]
     end
 
     def prune_cache?
@@ -338,8 +338,8 @@ def option_parser
           @options[:enabled_linters] = known_linter_names
         end
 
-        opts.on("--with-cache", "Enable caching") do |config|
-          @options[:with_cache] = config
+        opts.on("--cache", "Enable caching") do |config|
+          @options[:cache] = config
         end
 
         opts.on("--prune-cache", "Prune cache") do |config|
diff --git a/spec/erb_lint/cli_spec.rb b/spec/erb_lint/cli_spec.rb
index 25395dcc..a1a23d38 100644
--- a/spec/erb_lint/cli_spec.rb
+++ b/spec/erb_lint/cli_spec.rb
@@ -249,7 +249,7 @@ def run(processed_source)
         end
 
         context "with cache" do
-          let(:args) { ["--enable-linter", "linter_without_errors", "--with-cache", linted_file] }
+          let(:args) { ["--enable-linter", "linter_without_errors", "--cache", linted_file] }
 
           it "lints the file and adds it to the cache" do
             expect(Dir[ERBLint::Cache::CACHE_DIRECTORY].length).to(be(0))
@@ -472,7 +472,7 @@ def run(processed_source)
             end
 
             context "with cache" do
-              let(:args) { ["--enable-linter", "linter_without_errors", "--with-cache", linted_dir] }
+              let(:args) { ["--enable-linter", "linter_without_errors", "--cache", linted_dir] }
 
               it "lints the file and adds it to the cache" do
                 expect(Dir[ERBLint::Cache::CACHE_DIRECTORY].length).to(be(0))
@@ -590,7 +590,7 @@ def run(processed_source)
           context "when autocorrecting and caching are turned on" do
             # We assume that linter_with_errors is not autocorrectable...
             let(:args) do
-              ["--enable-linter", "linter_without_errors", "--stdin", linted_file, "--autocorrect", "--with-cache"]
+              ["--enable-linter", "linter_without_errors", "--stdin", linted_file, "--autocorrect", "--cache"]
             end
 
             it "throws an error saying the two modes cannot be used together" do

From 7ea048c5960d750d5a3b1bfe292436ecfe13436c Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Thu, 13 Oct 2022 07:55:51 -0400
Subject: [PATCH 20/85] Prune cache by default

---
 lib/erb_lint/cache.rb       | 15 +++++----------
 lib/erb_lint/cli.rb         | 10 +---------
 spec/erb_lint/cache_spec.rb | 21 ++-------------------
 3 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index 79b88a81..9efcd6a5 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -4,12 +4,11 @@ module ERBLint
   class Cache
     CACHE_DIRECTORY = ".erb-lint-cache"
 
-    def initialize(config, file_loader = nil, prune = false)
+    def initialize(config, file_loader = nil)
       @config = config
       @file_loader = file_loader
       @hits = []
       @new_results = []
-      @prune = prune
       puts "Cache mode is on"
     end
 
@@ -24,13 +23,13 @@ def get(filename, file_content)
       rescue Errno::ENOENT
         return false
       end
-      @hits.push(file_checksum) if prune?
+      @hits.push(file_checksum)
       cache_file_contents_as_offenses
     end
 
     def set(filename, file_content, offenses_as_json)
       file_checksum = checksum(filename, file_content)
-      @new_results.push(file_checksum) if prune?
+      @new_results.push(file_checksum)
 
       FileUtils.mkdir_p(CACHE_DIRECTORY)
 
@@ -40,11 +39,11 @@ def set(filename, file_content, offenses_as_json)
     end
 
     def close
-      prune_cache if prune?
+      prune_cache
     end
 
     def prune_cache
-      puts "Prune cache mode is on - pruned file names will be logged"
+      puts "File names pruned from the cache will be logged"
       if hits.empty?
         puts "Cache being created for the first time, skipping prune"
         return
@@ -94,9 +93,5 @@ def checksum(filename, file_content)
       # here.
       "_"
     end
-
-    def prune?
-      @prune
-    end
   end
 end
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index ae11f391..e21e4c4f 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -39,7 +39,7 @@ def run(args = ARGV)
 
       load_config
 
-      @cache = Cache.new(@config, file_loader, prune_cache?) if cache? || clear_cache?
+      @cache = Cache.new(@config, file_loader) if cache? || clear_cache?
 
       if clear_cache?
         if cache.cache_dir_exists?
@@ -149,10 +149,6 @@ def cache?
       @options[:cache]
     end
 
-    def prune_cache?
-      @options[:prune_cache]
-    end
-
     def clear_cache?
       @options[:clear_cache]
     end
@@ -342,10 +338,6 @@ def option_parser
           @options[:cache] = config
         end
 
-        opts.on("--prune-cache", "Prune cache") do |config|
-          @options[:prune_cache] = config
-        end
-
         opts.on("--clear-cache", "Clear cache") do |config|
           @options[:clear_cache] = config
         end
diff --git a/spec/erb_lint/cache_spec.rb b/spec/erb_lint/cache_spec.rb
index 141ccb75..d6d6689a 100644
--- a/spec/erb_lint/cache_spec.rb
+++ b/spec/erb_lint/cache_spec.rb
@@ -53,6 +53,7 @@
     it "returns a cached lint result" do
       cache_result = cache.get(linted_file_path, linted_file_content)
       expect(cache_result.count).to(eq(2))
+      expect(cache.send(:hits)).to(include(checksum))
     end
   end
 
@@ -65,6 +66,7 @@
           checksum
         )
       )).to(be(true))
+      expect(cache.send(:new_results)).to(include(checksum))
     end
   end
 
@@ -141,27 +143,8 @@
     end
   end
 
-  describe "prune cache mode on #get and #[] behavior" do
-    before do
-      allow(cache).to(receive(:prune?).and_return(true))
-    end
-
-    it "adds new result to cache object new_results list attribute" do
-      cache.set(linted_file_path, linted_file_content, cache_file_content)
-
-      expect(cache.send(:new_results)).to(include(checksum))
-    end
-
-    it "adds new cache hit to cache object hits list attribute" do
-      cache.get(linted_file_path, linted_file_content)
-
-      expect(cache.send(:hits)).to(include(checksum))
-    end
-  end
-
   describe "#close" do
     it "Calls prune_cache if prune_cache mode is on" do
-      allow(cache).to(receive(:prune?).and_return(true))
       expect(cache).to(receive(:prune_cache))
       cache.close
     end

From a32816d29817bdd056b9fd3ca487d58db0467241 Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Thu, 13 Oct 2022 08:00:06 -0400
Subject: [PATCH 21/85] Add README for cache

---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/README.md b/README.md
index 6c026dba..9d0acdb6 100644
--- a/README.md
+++ b/README.md
@@ -590,6 +590,23 @@ app/views/users/_graph.html.erb:27:37: Extra space detected where there should b
 2 error(s) were found in ERB files
 ```
 
+## Caching
+
+The cache is currently opt-in - to turn it on, use the --cache option:
+
+```sh
+erblint --cache ./app
+Cache mode is on
+Linting 413 files with 15 linters...
+File names pruned from the cache will be logged
+
+No errors were found in ERB files
+```
+
+When the cache is on, lint results are stored in the `.erb-lint-cache` directory, in files with a filename computed with a hash of information about the file and `erb-lint` that should change when necessary. These files store instance attributes of the `CachedOffense` object, which only contain the `Offense` attributes necessary to restore the results of running `erb-lint` for output. The cache also automatically prunes outdated files each time it's run.
+
+You can also use the --clear-cache option to delete the cache file directory.
+
 ## License
 
 This project is released under the [MIT license](LICENSE.txt).

From e08285533ad14d9ffcfc17ae1475f7d416647452 Mon Sep 17 00:00:00 2001
From: Zach Feldman <zmf@frame.work>
Date: Tue, 18 Oct 2022 08:14:20 -0400
Subject: [PATCH 22/85] Reduce output of pruning process

---
 lib/erb_lint/cache.rb       | 11 +----------
 spec/erb_lint/cache_spec.rb |  4 ++--
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index 9efcd6a5..ee537e17 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -43,7 +43,6 @@ def close
     end
 
     def prune_cache
-      puts "File names pruned from the cache will be logged"
       if hits.empty?
         puts "Cache being created for the first time, skipping prune"
         return
@@ -51,18 +50,10 @@ def prune_cache
 
       cache_files = Dir.new(CACHE_DIRECTORY).children
       cache_files.each do |cache_file|
-        next if hits.include?(cache_file)
+        next if hits.include?(cache_file) || new_results.include?(cache_file)
 
-        if new_results.include?(cache_file)
-          puts "Skipping deletion of new cache result #{cache_file}"
-          next
-        end
-
-        puts "Cleaning deleted cached file with checksum #{cache_file}"
         File.delete(File.join(CACHE_DIRECTORY, cache_file))
       end
-
-      @hits = []
     end
 
     def cache_dir_exists?
diff --git a/spec/erb_lint/cache_spec.rb b/spec/erb_lint/cache_spec.rb
index d6d6689a..93731202 100644
--- a/spec/erb_lint/cache_spec.rb
+++ b/spec/erb_lint/cache_spec.rb
@@ -112,7 +112,7 @@
       allow(fakefs_dir).to(receive(:children).and_return([checksum]))
       allow(FakeFS::Dir).to(receive(:new).and_return(fakefs_dir))
 
-      expect { cache.prune_cache }.to(output(/.*Skipping deletion of new cache result #{checksum}/).to_stdout)
+      cache.prune_cache
 
       expect(File.exist?(
         File.join(
@@ -132,7 +132,7 @@
         f.write(cache_file_content)
       end
 
-      expect { cache.prune_cache }.to(output(/Cleaning deleted cached file with checksum fake-checksum/).to_stdout)
+      cache.prune_cache
 
       expect(File.exist?(
         File.join(

From 5f9092960f1465f11bfeda3f4a8897b3baf6a9ed Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Wed, 19 Oct 2022 14:42:40 +0100
Subject: [PATCH 23/85] lib/erb_lint/linters: Add a new `CommentSyntax` linter

- This adds a new ERB comment syntax linter to catch ERB comments that
  could trip up the Ruby parser in latest versions of Ruby.
- The ERB documentation[1] says that Ruby comments are not valid in ERB,
  and that comments in ERB should be of the form `<%# comment here %>`
  and not `<% # comment here %>`. That is, no space between the opening
  `<%` and the `#` character.
- This documentation is only a guideline usually, because in most cases
  Ruby-style comments work just fine. However, using the Ruby 3.1 parser,
  RuboCop's `Lint/Syntax` cop started failing on ERB files that included
  comments with semicolons in them.

- Take an example ERB file:

```
<%# This is the correct comment syntax. %>
<%# Recommending the "proper" ERB comment syntax seems like the safest way to go; even with semicolons it will parse. %>
<% # This is technically incorrect comment syntax but it generally parses. %>
<% # Until someone puts a ; in. %>
```

- This led to output from RuboCop's `Lint/Syntax` cop
  (RuboCop v1.36, `TargetRubyVersion: 3.1`) where it failed to parse the
  file, but its code snippets and offense locations were not very useful.
  (Admittedly it's less visible in this contrived example, you'll have
  to trust me!)

```
app/views/proof_of_concept.html.erb:7:2: E: Lint/Syntax: unexpected token kIN
(Using Ruby 3.1 parser; configure using TargetRubyVersion parameter, under AllCops)
 in.
 ^^

1 file inspected, 1 offense detected
```

- After lots of being confused, because the code looked like valid Ruby
  and the editor was syntax highlighting it if it were a valid comment,
  we realised that it was the semicolon in the comment in the ERB that
  was tripping the Ruby 3.1 parser up.
- Doing some digging, it turns out that this could have all been avoided
  if our codebase had respected ERB's "Ruby comments are not valid"
  guideline[1]. I went hunting for a RuboCop rule for this, then
  remembered that ERBLint existed and is way better suited to linting
  ERB. There wasn't an existing rule for ERB comment syntax that I could
  find, hence this addition, because I feel like individual developers
  shouldn't have to know this quirk of ERB off the top of their heads
  when it can cause such confusing errors!

[1] - https://github.com/ruby/erb/tree/a3492c4bd1061071814cca085544ce259a9d8d56#recognized-tags
---
 lib/erb_lint/linters/comment_syntax.rb       | 64 ++++++++++++++++++++
 spec/erb_lint/linters/comment_syntax_spec.rb | 40 ++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 lib/erb_lint/linters/comment_syntax.rb
 create mode 100644 spec/erb_lint/linters/comment_syntax_spec.rb

diff --git a/lib/erb_lint/linters/comment_syntax.rb b/lib/erb_lint/linters/comment_syntax.rb
new file mode 100644
index 00000000..214e90ef
--- /dev/null
+++ b/lib/erb_lint/linters/comment_syntax.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module ERBLint
+  module Linters
+    # Detects comment syntax that isn't valid ERB.
+    class CommentSyntax < Linter
+      include LinterRegistry
+
+      def initialize(file_loader, config)
+        super
+      end
+
+      def run(processed_source)
+        file_content = processed_source.file_content
+
+        return if file_content.empty?
+
+        processed_source.ast.descendants(:erb).each do |erb_node|
+          indicator_node, _, code_node, _ = *erb_node
+          next if indicator_node.nil? || code_node.nil?
+
+          indicator_node_str = indicator_node.deconstruct.last
+          next if indicator_node_str == "#"
+
+          if indicator_node_str == "="
+            range = find_range(erb_node, indicator_node_str)
+            source_range = processed_source.to_source_range(range)
+
+            add_offense(
+              source_range,
+              <<~EOF.chomp
+                Bad ERB comment syntax. Should be `<%#=` without a space between.
+                Leaving a space between ERB tags and the Ruby comment character can cause parser errors.
+              EOF
+            )
+          end
+
+          code_node_str = code_node.deconstruct.last
+          next unless code_node_str.start_with?(" #")
+
+          range = find_range(erb_node, code_node_str)
+          source_range = processed_source.to_source_range(range)
+
+          add_offense(
+            source_range,
+            <<~EOF.chomp
+              Bad ERB comment syntax. Should be `<%#` without a space between.
+              Leaving a space between ERB tags and the Ruby comment character can cause parser errors.
+            EOF
+          )
+        end
+      end
+
+      def find_range(node, str)
+        match = node.loc.source.match(Regexp.new(Regexp.quote(str.strip)))
+        return unless match
+
+        range_begin = match.begin(0) + node.loc.begin_pos
+        range_end   = match.end(0) + node.loc.begin_pos
+        (range_begin...range_end)
+      end
+    end
+  end
+end
diff --git a/spec/erb_lint/linters/comment_syntax_spec.rb b/spec/erb_lint/linters/comment_syntax_spec.rb
new file mode 100644
index 00000000..b21d7aae
--- /dev/null
+++ b/spec/erb_lint/linters/comment_syntax_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe ERBLint::Linters::CommentSyntax do
+  let(:linter_config) { described_class.config_schema.new }
+
+  let(:file_loader) { ERBLint::FileLoader.new(".") }
+  let(:linter) { described_class.new(file_loader, linter_config) }
+  let(:processed_source) { ERBLint::ProcessedSource.new("file.rb", file) }
+
+  subject { linter.offenses }
+  before { linter.run(processed_source) }
+
+  context "when the ERB comment syntax is correct" do
+    let(:file) { <<~FILE }
+      <%# good comment %>
+    FILE
+
+    it "does not report any offenses" do
+      expect(subject.size).to(eq(0))
+    end
+  end
+
+  context "when the ERB comment syntax is incorrect" do
+    let(:file) { <<~FILE }
+      <% # first bad comment %>
+      <%= # second bad comment %>
+    FILE
+
+    it "reports two offenses" do
+      expect(subject.size).to(eq(2))
+    end
+
+    it "reports two offenses with their suggested fixes" do
+      expect(subject.first.message).to(include("Bad ERB comment syntax. Should be `<%#=` without a space between."))
+      expect(subject.last.message).to(include("Bad ERB comment syntax. Should be `<%#` without a space between."))
+    end
+  end
+end

From 911faf3c0868aafafdd66f07e3b2b13caed4b644 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Thu, 20 Oct 2022 10:18:58 +0100
Subject: [PATCH 24/85] linters/CommentSyntax: Improve docs & code style; add
 another test

- It's better to have too many test cases than too few, and I realised
  forgot about the fact that multi-line ERB comments _can_ have spaces.
---
 README.md                                    |  1 +
 lib/erb_lint/linters/comment_syntax.rb       |  1 -
 spec/erb_lint/linters/comment_syntax_spec.rb | 12 ++++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6c026dba..23ff64ad 100644
--- a/README.md
+++ b/README.md
@@ -110,6 +110,7 @@ linters:
 | [ErbSafety](#ErbSafety)                          | No       | detects unsafe interpolation of ruby data into various javascript contexts and enforce usage of safe helpers like `.to_json`. |
 | [Rubocop](#Rubocop)                              | No       | runs RuboCop rules on ruby statements found in ERB templates |
 | [RequireScriptNonce](#RequireScriptNonce)        | No       | warns about missing [Content Security Policy nonces](https://guides.rubyonrails.org/security.html#content-security-policy) in script tags |
+| CommentSyntax                                    | No       | detects bad comment syntax, ie `<% # comment %>` is not technically valid ERB but `<%# comment %>` is |
 
 ### DeprecatedClasses
 
diff --git a/lib/erb_lint/linters/comment_syntax.rb b/lib/erb_lint/linters/comment_syntax.rb
index 214e90ef..6a0aef9b 100644
--- a/lib/erb_lint/linters/comment_syntax.rb
+++ b/lib/erb_lint/linters/comment_syntax.rb
@@ -12,7 +12,6 @@ def initialize(file_loader, config)
 
       def run(processed_source)
         file_content = processed_source.file_content
-
         return if file_content.empty?
 
         processed_source.ast.descendants(:erb).each do |erb_node|
diff --git a/spec/erb_lint/linters/comment_syntax_spec.rb b/spec/erb_lint/linters/comment_syntax_spec.rb
index b21d7aae..c098bd1e 100644
--- a/spec/erb_lint/linters/comment_syntax_spec.rb
+++ b/spec/erb_lint/linters/comment_syntax_spec.rb
@@ -22,6 +22,18 @@
     end
   end
 
+  context "when the ERB multi-line comment syntax is correct" do
+    let(:file) { <<~FILE }
+      <%
+        # good comment
+      %>
+    FILE
+
+    it "does not report any offenses" do
+      expect(subject.size).to(eq(0))
+    end
+  end
+
   context "when the ERB comment syntax is incorrect" do
     let(:file) { <<~FILE }
       <% # first bad comment %>

From 4166d9bf883fcea2c01bb5e3599de173182bf3d2 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Thu, 20 Oct 2022 11:24:09 +0100
Subject: [PATCH 25/85] linters/CommentSyntax: Fix the `<% # comment %>`
 detection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Previously I erroneously did a `next if indicator_node.nil?`, which
  meant that for a file with multiple offenses where one of them was
  `<%= # comment %>` which _was_ getting correctly detected, it was
  working, but the last one `<% # comment %>` syntax was not being
  detected properly.
- This bug manifested in having two offenses detected for the same line,
  because it was never moving past the first detected offense because in
  the `<%` ERB opening case, `indicator_node` is nil and was getting
  skipped. Not what I originally intended! There were two results,
  however, and the tests passed. This was because for `<%= # bad comment
  here %>` it was detecting `<%=` for the `indicator_node_str == "#"`
  condition and then adding another offense because that same line's
  `code_node_str` (` # bad comment here`) started with ` #` so also
  matched the second condition which added another offense. (See
  examples below.)
- This commit also refactors a bit to make things simpler and less
  repetitive - since `add_offense` appends to an array of offenses
  internally, we can only call it once and get rid of the multiple ifs
  because they're confusing, tweaking the message depending on whether
  it's a `<%=` expression or a `<%` expression.

Sample ERB file:

```
<%# erb comment here %>
<%= # bad erb comment here %>
<%
  # apparently this comment syntax is valid?
%>
<% # very; bad erb comment here %>
```

Example behaviour before:

```
Bad ERB comment syntax. Should be <%#= without a space between.
Leaving a space between ERB tags and the Ruby comment character can cause parser errors.
In file: test_comment_syntax.html.erb:2

Bad ERB comment syntax. Should be <%# without a space between.
Leaving a space between ERB tags and the Ruby comment character can cause parser errors.
In file: test_comment_syntax.html.erb:2
```

Example behaviour now (fixed):

```
❯ exe/erblint --enable-linters=comment_syntax test_comment_syntax.html.erb
.erb-lint.yml not found: using default config
Linting 1 files with 1 linters...

Bad ERB comment syntax. Should be <%#= without a space between.
Leaving a space between ERB tags and the Ruby comment character can cause parser errors.
In file: test_comment_syntax.html.erb:2

Bad ERB comment syntax. Should be <%# without a space between.
Leaving a space between ERB tags and the Ruby comment character can cause parser errors.
In file: test_comment_syntax.html.erb:6

2 error(s) were found in ERB files
```
---
 lib/erb_lint/linters/comment_syntax.rb       | 21 +++++---------------
 spec/erb_lint/linters/comment_syntax_spec.rb | 20 ++++++++++++++++---
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/lib/erb_lint/linters/comment_syntax.rb b/lib/erb_lint/linters/comment_syntax.rb
index 6a0aef9b..359e06b4 100644
--- a/lib/erb_lint/linters/comment_syntax.rb
+++ b/lib/erb_lint/linters/comment_syntax.rb
@@ -16,34 +16,23 @@ def run(processed_source)
 
         processed_source.ast.descendants(:erb).each do |erb_node|
           indicator_node, _, code_node, _ = *erb_node
-          next if indicator_node.nil? || code_node.nil?
+          next if code_node.nil?
 
-          indicator_node_str = indicator_node.deconstruct.last
+          indicator_node_str = indicator_node&.deconstruct&.last
           next if indicator_node_str == "#"
 
-          if indicator_node_str == "="
-            range = find_range(erb_node, indicator_node_str)
-            source_range = processed_source.to_source_range(range)
-
-            add_offense(
-              source_range,
-              <<~EOF.chomp
-                Bad ERB comment syntax. Should be `<%#=` without a space between.
-                Leaving a space between ERB tags and the Ruby comment character can cause parser errors.
-              EOF
-            )
-          end
-
           code_node_str = code_node.deconstruct.last
           next unless code_node_str.start_with?(" #")
 
           range = find_range(erb_node, code_node_str)
           source_range = processed_source.to_source_range(range)
 
+          correct_erb_tag = indicator_node_str == "=" ? "<%#=" : "<%#"
+
           add_offense(
             source_range,
             <<~EOF.chomp
-              Bad ERB comment syntax. Should be `<%#` without a space between.
+              Bad ERB comment syntax. Should be #{correct_erb_tag} without a space between.
               Leaving a space between ERB tags and the Ruby comment character can cause parser errors.
             EOF
           )
diff --git a/spec/erb_lint/linters/comment_syntax_spec.rb b/spec/erb_lint/linters/comment_syntax_spec.rb
index c098bd1e..4404a3bd 100644
--- a/spec/erb_lint/linters/comment_syntax_spec.rb
+++ b/spec/erb_lint/linters/comment_syntax_spec.rb
@@ -35,6 +35,20 @@
   end
 
   context "when the ERB comment syntax is incorrect" do
+    let(:file) { <<~FILE }
+      <% # bad comment %>
+    FILE
+
+    it "reports one offense" do
+      expect(subject.size).to(eq(1))
+    end
+
+    it "reports the suggested fix" do
+      expect(subject.first.message).to(include("Bad ERB comment syntax. Should be <%# without a space between."))
+    end
+  end
+
+  context "when the ERB comment syntax is incorrect multiple times in one file" do
     let(:file) { <<~FILE }
       <% # first bad comment %>
       <%= # second bad comment %>
@@ -44,9 +58,9 @@
       expect(subject.size).to(eq(2))
     end
 
-    it "reports two offenses with their suggested fixes" do
-      expect(subject.first.message).to(include("Bad ERB comment syntax. Should be `<%#=` without a space between."))
-      expect(subject.last.message).to(include("Bad ERB comment syntax. Should be `<%#` without a space between."))
+    it "reports the suggested fixes" do
+      expect(subject.first.message).to(include("Bad ERB comment syntax. Should be <%# without a space between."))
+      expect(subject.last.message).to(include("Bad ERB comment syntax. Should be <%#= without a space between."))
     end
   end
 end

From 7f0b494e498389eba0fc4181572ac24feb369ca9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Oct 2022 10:36:39 +0200
Subject: [PATCH 26/85] Bump nokogiri from 1.13.8 to 1.13.9 (#281)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.8 to 1.13.9.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.8...v1.13.9)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 72c45979..f457acd5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,7 +44,7 @@ GEM
       nokogiri (>= 1.5.9)
     mini_portile2 (2.8.0)
     minitest (5.16.3)
-    nokogiri (1.13.8)
+    nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)

From d0e72efca25db6b6467a2f83449227193a90ae65 Mon Sep 17 00:00:00 2001
From: Issy Long <issyl0@github.com>
Date: Wed, 26 Oct 2022 11:44:23 +0100
Subject: [PATCH 27/85] README: Add good and bad examples for `CommentSyntax`

---
 README.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 23ff64ad..de056cba 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ linters:
 | [ErbSafety](#ErbSafety)                          | No       | detects unsafe interpolation of ruby data into various javascript contexts and enforce usage of safe helpers like `.to_json`. |
 | [Rubocop](#Rubocop)                              | No       | runs RuboCop rules on ruby statements found in ERB templates |
 | [RequireScriptNonce](#RequireScriptNonce)        | No       | warns about missing [Content Security Policy nonces](https://guides.rubyonrails.org/security.html#content-security-policy) in script tags |
-| CommentSyntax                                    | No       | detects bad comment syntax, ie `<% # comment %>` is not technically valid ERB but `<%# comment %>` is |
+| [CommentSyntax](#CommentSyntax)                  | No       | detects bad ERB comment syntax |
 
 ### DeprecatedClasses
 
@@ -488,6 +488,27 @@ Linter-Specific Option    | Description
 `allow_blank`             | True or false, depending on whether or not the `type` attribute may be omitted entirely from a `<script>` tag. Defaults to `true`.
 `disallow_inline_scripts` | Do not allow inline `<script>` tags anywhere in ERB templates. Defaults to `false`.
 
+## CommentSyntax
+
+This linter enforces the use of the correct ERB comment syntax, since Ruby comments (`<% # comment %>` with a space) are not technically valid ERB comments.
+
+```erb
+Bad ❌
+<% # This is a Ruby comment %>
+Good ✅
+<%# This is an ERB comment %>
+
+Bad ❌
+<% # This is a Ruby comment; it can fail to parse. %>
+Good ✅
+<%# This is an ERB comment; it is parsed correctly. %>
+
+Good ✅
+<%
+  # This is a multi-line ERB comment.
+%>
+```
+
 ## Custom Linters
 
 `erb-lint` allows you to create custom linters specific to your project. It will load linters from the `.erb-linters` directory in the root of your

From af809c6fa4e08d2bae24c1fe5bbe8618f088e574 Mon Sep 17 00:00:00 2001
From: Issy Long <issyl0@github.com>
Date: Wed, 26 Oct 2022 11:47:39 +0100
Subject: [PATCH 28/85] runner_config,README: Enable `CommentSyntax` linter by
 default

- Since this can easily trip people up and Ruby comments are invalid ERB.
---
 README.md                     | 2 +-
 lib/erb_lint/runner_config.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index de056cba..0218b841 100644
--- a/README.md
+++ b/README.md
@@ -94,6 +94,7 @@ linters:
 | ------------------------------------------------ |:--------:|-------------|
 | [AllowedScriptType](#AllowedScriptType)          | Yes      | prevents the addition of `<script>` tags that have `type` attributes that are not in a white-list of allowed values |
 | ClosingErbTagIndent                              | Yes      |             |
+| [CommentSyntax](#CommentSyntax)                  | Yes      | detects bad ERB comment syntax |
 | ExtraNewline                                     | Yes      |             |
 | [FinalNewline](#FinalNewline)                    | Yes      | warns about missing newline at the end of a ERB template |
 | [NoJavascriptTagHelper](#NoJavascriptTagHelper)  | Yes      | prevents the usage of Rails' `javascript_tag` |
@@ -110,7 +111,6 @@ linters:
 | [ErbSafety](#ErbSafety)                          | No       | detects unsafe interpolation of ruby data into various javascript contexts and enforce usage of safe helpers like `.to_json`. |
 | [Rubocop](#Rubocop)                              | No       | runs RuboCop rules on ruby statements found in ERB templates |
 | [RequireScriptNonce](#RequireScriptNonce)        | No       | warns about missing [Content Security Policy nonces](https://guides.rubyonrails.org/security.html#content-security-policy) in script tags |
-| [CommentSyntax](#CommentSyntax)                  | No       | detects bad ERB comment syntax |
 
 ### DeprecatedClasses
 
diff --git a/lib/erb_lint/runner_config.rb b/lib/erb_lint/runner_config.rb
index 6ccbaf80..c2b1fc7d 100644
--- a/lib/erb_lint/runner_config.rb
+++ b/lib/erb_lint/runner_config.rb
@@ -63,6 +63,7 @@ def default(default_enabled: nil)
             SpaceInHtmlTag: { enabled: default_enabled },
             TrailingWhitespace: { enabled: default_enabled },
             RequireInputAutocomplete: { enabled: default_enabled },
+            CommentSyntax: { enabled: default_enabled },
           },
         )
       end

From 5963de2bc5220048b393daf98cea0ccd14169859 Mon Sep 17 00:00:00 2001
From: Adrianna Chang <adrianna.chang@shopify.com>
Date: Wed, 26 Oct 2022 10:08:26 -0400
Subject: [PATCH 29/85] Remove unused file_loader from ERBLint::Cache
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Étienne Barrié <etienne.barrie@shopify.com>
---
 lib/erb_lint/cache.rb | 3 +--
 lib/erb_lint/cli.rb   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index ee537e17..90aea682 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -4,9 +4,8 @@ module ERBLint
   class Cache
     CACHE_DIRECTORY = ".erb-lint-cache"
 
-    def initialize(config, file_loader = nil)
+    def initialize(config)
       @config = config
-      @file_loader = file_loader
       @hits = []
       @new_results = []
       puts "Cache mode is on"
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index e21e4c4f..e6f450b0 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -39,7 +39,7 @@ def run(args = ARGV)
 
       load_config
 
-      @cache = Cache.new(@config, file_loader) if cache? || clear_cache?
+      @cache = Cache.new(@config) if cache? || clear_cache?
 
       if clear_cache?
         if cache.cache_dir_exists?

From bc67bd5b7563a84dc7ae9780ab3e743542881ba1 Mon Sep 17 00:00:00 2001
From: Adrianna Chang <adrianna.chang@shopify.com>
Date: Wed, 26 Oct 2022 10:58:49 -0400
Subject: [PATCH 30/85] Allow custom cache directory to passed in via
 --cache-dir flag
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Étienne Barrié <etienne.barrie@shopify.com>
---
 lib/erb_lint/cache.rb       | 17 +++++++++--------
 lib/erb_lint/cli.rb         |  7 ++++++-
 spec/erb_lint/cache_spec.rb |  5 +++--
 spec/erb_lint/cli_spec.rb   | 13 +++++++++++++
 4 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/lib/erb_lint/cache.rb b/lib/erb_lint/cache.rb
index 90aea682..94dde02d 100644
--- a/lib/erb_lint/cache.rb
+++ b/lib/erb_lint/cache.rb
@@ -4,8 +4,9 @@ module ERBLint
   class Cache
     CACHE_DIRECTORY = ".erb-lint-cache"
 
-    def initialize(config)
+    def initialize(config, cache_dir = nil)
       @config = config
+      @cache_dir = cache_dir || CACHE_DIRECTORY
       @hits = []
       @new_results = []
       puts "Cache mode is on"
@@ -15,7 +16,7 @@ def get(filename, file_content)
       file_checksum = checksum(filename, file_content)
       begin
         cache_file_contents_as_offenses = JSON.parse(
-          File.read(File.join(CACHE_DIRECTORY, file_checksum))
+          File.read(File.join(@cache_dir, file_checksum))
         ).map do |offense_hash|
           ERBLint::CachedOffense.new(offense_hash)
         end
@@ -30,9 +31,9 @@ def set(filename, file_content, offenses_as_json)
       file_checksum = checksum(filename, file_content)
       @new_results.push(file_checksum)
 
-      FileUtils.mkdir_p(CACHE_DIRECTORY)
+      FileUtils.mkdir_p(@cache_dir)
 
-      File.open(File.join(CACHE_DIRECTORY, file_checksum), "wb") do |f|
+      File.open(File.join(@cache_dir, file_checksum), "wb") do |f|
         f.write(offenses_as_json)
       end
     end
@@ -47,23 +48,23 @@ def prune_cache
         return
       end
 
-      cache_files = Dir.new(CACHE_DIRECTORY).children
+      cache_files = Dir.new(@cache_dir).children
       cache_files.each do |cache_file|
         next if hits.include?(cache_file) || new_results.include?(cache_file)
 
-        File.delete(File.join(CACHE_DIRECTORY, cache_file))
+        File.delete(File.join(@cache_dir, cache_file))
       end
     end
 
     def cache_dir_exists?
-      File.directory?(CACHE_DIRECTORY)
+      File.directory?(@cache_dir)
     end
 
     def clear
       return unless cache_dir_exists?
 
       puts "Clearing cache by deleting cache directory"
-      FileUtils.rm_r(CACHE_DIRECTORY)
+      FileUtils.rm_r(@cache_dir)
     end
 
     private
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index e6f450b0..21cc4477 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -39,7 +39,8 @@ def run(args = ARGV)
 
       load_config
 
-      @cache = Cache.new(@config) if cache? || clear_cache?
+      cache_dir = @options[:cache_dir]
+      @cache = Cache.new(@config, cache_dir) if cache? || clear_cache?
 
       if clear_cache?
         if cache.cache_dir_exists?
@@ -338,6 +339,10 @@ def option_parser
           @options[:cache] = config
         end
 
+        opts.on("--cache-dir DIR", "Set the cache directory") do |dir|
+          @options[:cache_dir] = dir
+        end
+
         opts.on("--clear-cache", "Clear cache") do |config|
           @options[:clear_cache] = config
         end
diff --git a/spec/erb_lint/cache_spec.rb b/spec/erb_lint/cache_spec.rb
index 93731202..5d6e5477 100644
--- a/spec/erb_lint/cache_spec.rb
+++ b/spec/erb_lint/cache_spec.rb
@@ -9,10 +9,10 @@
   include FakeFS::SpecHelpers
 
   let(:linter_config) { ERBLint::LinterConfig.new }
-  let(:cache) { described_class.new(linter_config) }
+  let(:cache) { described_class.new(linter_config, cache_dir) }
   let(:linted_file_path) { "app/components/elements/image_component/image_component.html.erb" }
   let(:checksum) { "2dc3e17183b87889cc783b0157723570d4bbb90a" }
-  let(:cache_dir) { ERBLint::Cache::CACHE_DIRECTORY }
+  let(:cache_dir) { "tmp/erb_lint" }
   let(:rubocop_yml) { %(SpaceAroundErbTag:\n  Enabled: true\n) }
   let(:cache_file_content) do
     FakeFS.deactivate!
@@ -74,6 +74,7 @@
     it "returns true if the cache dir exists" do
       expect(cache.cache_dir_exists?).to(be(true))
     end
+
     it "returns false if the cache dir does not exist" do
       FileUtils.rm_rf(cache_dir)
       expect(cache.cache_dir_exists?).to(be(false))
diff --git a/spec/erb_lint/cli_spec.rb b/spec/erb_lint/cli_spec.rb
index a1a23d38..edbc6026 100644
--- a/spec/erb_lint/cli_spec.rb
+++ b/spec/erb_lint/cli_spec.rb
@@ -148,6 +148,19 @@ def run(processed_source)
       end
     end
 
+    context "with custom --cache-dir" do
+      let(:args) { ["--lint-all", "--enable-linter", "linter_with_errors", "--clear-cache", "--cache-dir", cache_dir] }
+      let(:cache_dir) { "tmp/erb_lint" }
+
+      before do
+        FileUtils.mkdir_p(cache_dir)
+      end
+
+      it "uses the specified directory" do
+        expect { subject }.to(output(/cache directory cleared/).to_stdout)
+      end
+    end
+
     context "with file as argument" do
       context "when file does not exist" do
         let(:linted_file) { "/path/to/myfile.html.erb" }

From 4e28007edd40a945472fed1e92f57950f9650d92 Mon Sep 17 00:00:00 2001
From: Adrianna Chang <adrianna.chang@shopify.com>
Date: Thu, 27 Oct 2022 09:20:28 -0400
Subject: [PATCH 31/85] Update README

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cd397cd3..ec6688d8 100644
--- a/README.md
+++ b/README.md
@@ -625,7 +625,10 @@ File names pruned from the cache will be logged
 No errors were found in ERB files
 ```
 
-When the cache is on, lint results are stored in the `.erb-lint-cache` directory, in files with a filename computed with a hash of information about the file and `erb-lint` that should change when necessary. These files store instance attributes of the `CachedOffense` object, which only contain the `Offense` attributes necessary to restore the results of running `erb-lint` for output. The cache also automatically prunes outdated files each time it's run.
+Cached lint results are stored in the `.erb-lint-cache` directory by default, though a custom directory can be provided
+via the `--cache-dir` option. Cache filenames are computed with a hash of information about the file and `erb-lint` settings.
+These files store instance attributes of the `CachedOffense` object, which only contain the `Offense` attributes
+necessary to restore the results of running `erb-lint` for output. The cache also automatically prunes outdated files each time it's run.
 
 You can also use the --clear-cache option to delete the cache file directory.
 

From fcae6bdba02847b86aa85e56b4038d6f1a960f69 Mon Sep 17 00:00:00 2001
From: Adrianna Chang <adrianna.chang@shopify.com>
Date: Tue, 1 Nov 2022 08:21:38 -0400
Subject: [PATCH 32/85] Prepare to release 0.3.0

---
 Gemfile.lock            | 10 +++++-----
 lib/erb_lint/version.rb |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index f457acd5..c523954e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    erb_lint (0.2.0)
+    erb_lint (0.3.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
@@ -12,13 +12,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (7.0.3.1)
-      activesupport (= 7.0.3.1)
+    actionview (7.0.4)
+      activesupport (= 7.0.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.3.1)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -39,7 +39,7 @@ GEM
     fakefs (1.5.1)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.18.0)
+    loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mini_portile2 (2.8.0)
diff --git a/lib/erb_lint/version.rb b/lib/erb_lint/version.rb
index 7505793f..7eda0a53 100644
--- a/lib/erb_lint/version.rb
+++ b/lib/erb_lint/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ERBLint
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

From 51cd7f1d6f449793d54d5035a04caf227b8d32f8 Mon Sep 17 00:00:00 2001
From: Adrianna Chang <adrianna.chang@shopify.com>
Date: Tue, 1 Nov 2022 09:03:36 -0400
Subject: [PATCH 33/85] Pin rubocop

---
 gemfiles/Gemfile.rubocop-next | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gemfiles/Gemfile.rubocop-next b/gemfiles/Gemfile.rubocop-next
index e1d42c58..16894d8d 100644
--- a/gemfiles/Gemfile.rubocop-next
+++ b/gemfiles/Gemfile.rubocop-next
@@ -2,4 +2,4 @@
 
 eval_gemfile "../Gemfile"
 
-gem "rubocop", ">= 0.87"
+gem "rubocop", "~> 1.37.1"

From d73173859272bbaf465d35b4f0e5ce7343e11d2e Mon Sep 17 00:00:00 2001
From: Matijs van Zuijlen <matijs@matijs.net>
Date: Tue, 1 Nov 2022 17:26:20 +0100
Subject: [PATCH 34/85] Clarify list of strings that don't need translating

The name TEXT_NOT_ALLOWED was confusing and indicated the opposite
meaning of what was intended, namely text that is allowed to stay
hard-coded.
---
 lib/erb_lint/linters/hard_coded_string.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/erb_lint/linters/hard_coded_string.rb b/lib/erb_lint/linters/hard_coded_string.rb
index 2c9c82fd..8a0a7e14 100644
--- a/lib/erb_lint/linters/hard_coded_string.rb
+++ b/lib/erb_lint/linters/hard_coded_string.rb
@@ -17,7 +17,7 @@ class HardCodedString < Linter
       ALLOWED_CORRECTORS = ["I18nCorrector", "RuboCop::Corrector::I18n::HardCodedString"]
 
       NON_TEXT_TAGS = Set.new(["script", "style", "xmp", "iframe", "noembed", "noframes", "listing"])
-      TEXT_NOT_ALLOWED = Set.new([
+      NO_TRANSLATION_NEEDED = Set.new([
         "&nbsp;",
         "&amp;",
         "&lt;",
@@ -96,7 +96,7 @@ def autocorrect(processed_source, offense)
 
       def check_string?(str)
         string = str.gsub(/\s*/, "")
-        string.length > 1 && !TEXT_NOT_ALLOWED.include?(string)
+        string.length > 1 && !NO_TRANSLATION_NEEDED.include?(string)
       end
 
       def load_corrector

From 731fd4b3c24bd915c94e597d95ecd47f024c3ab9 Mon Sep 17 00:00:00 2001
From: mishina <temma182008@gmail.com>
Date: Sat, 5 Nov 2022 22:12:04 +0900
Subject: [PATCH 35/85] Bump actions/checkout from v2 to v3

---
 .github/workflows/linting.yml | 2 +-
 .github/workflows/test.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index b58d80c0..352fef56 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -6,7 +6,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: '3.0'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1655be84..464e156f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: gemfiles/Gemfile.${{ matrix.gemfile }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

From 61267498f2d780a2976b90ae7621328cd111513c Mon Sep 17 00:00:00 2001
From: Matijs van Zuijlen <matijs@matijs.net>
Date: Wed, 9 Nov 2022 19:57:25 +0100
Subject: [PATCH 36/85] Bump and loosen rubocop version in rubocop-next bundle

---
 gemfiles/Gemfile.rubocop-next | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gemfiles/Gemfile.rubocop-next b/gemfiles/Gemfile.rubocop-next
index 16894d8d..48f29505 100644
--- a/gemfiles/Gemfile.rubocop-next
+++ b/gemfiles/Gemfile.rubocop-next
@@ -2,4 +2,4 @@
 
 eval_gemfile "../Gemfile"
 
-gem "rubocop", "~> 1.37.1"
+gem "rubocop", ">= 1.38.0"

From 9b7dec10f51cd5e505347aded25d4d7e1aec94c4 Mon Sep 17 00:00:00 2001
From: Matijs van Zuijlen <matijs@matijs.net>
Date: Wed, 9 Nov 2022 20:34:57 +0100
Subject: [PATCH 37/85] Make RuboCop linter work with RuboCop 1.38

This version of RuboCop needs registry and config attributes to be set
on the ProcessedSource object. These attributes do not exist in earlier
versions of RuboCop.
---
 lib/erb_lint/linters/rubocop.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/erb_lint/linters/rubocop.rb b/lib/erb_lint/linters/rubocop.rb
index 7cefe970..6f99058d 100644
--- a/lib/erb_lint/linters/rubocop.rb
+++ b/lib/erb_lint/linters/rubocop.rb
@@ -131,11 +131,17 @@ def tempfile_from(filename, content)
       end
 
       def rubocop_processed_source(content, filename)
-        ::RuboCop::ProcessedSource.new(
+        source = ::RuboCop::ProcessedSource.new(
           content,
           @rubocop_config.target_ruby_version,
           filename
         )
+        if ::RuboCop::Version::STRING.to_f >= 1.38
+          registry = RuboCop::Cop::Registry.global
+          source.registry = registry
+          source.config = @rubocop_config
+        end
+        source
       end
 
       def cop_classes

From cabf1460cb0d6e62af4f448aa43024bc3df8517c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20Barri=C3=A9?= <etienne.barrie@shopify.com>
Date: Thu, 10 Nov 2022 11:10:00 +0100
Subject: [PATCH 38/85] Bump to 0.3.1

---
 Gemfile.lock            | 2 +-
 lib/erb_lint/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c523954e..a9afe33b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    erb_lint (0.3.0)
+    erb_lint (0.3.1)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
diff --git a/lib/erb_lint/version.rb b/lib/erb_lint/version.rb
index 7eda0a53..3507433e 100644
--- a/lib/erb_lint/version.rb
+++ b/lib/erb_lint/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ERBLint
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

From c0440a7ac3503a3bbcad9cdf9b2bbdcce15f0992 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Dec 2022 03:58:04 +0000
Subject: [PATCH 39/85] Bump nokogiri from 1.13.9 to 1.13.10

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.9 to 1.13.10.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.9...v1.13.10)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a9afe33b..ca5c597d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,13 +44,13 @@ GEM
       nokogiri (>= 1.5.9)
     mini_portile2 (2.8.0)
     minitest (5.16.3)
-    nokogiri (1.13.9)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
-    racc (1.6.0)
+    racc (1.6.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)

From 6257060a261e9baa70ea992f0205674140311ae9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Dec 2022 21:46:18 +0000
Subject: [PATCH 40/85] Bump loofah from 2.19.0 to 2.19.1

Bumps [loofah](https://github.com/flavorjones/loofah) from 2.19.0 to 2.19.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.19.0...v2.19.1)

---
updated-dependencies:
- dependency-name: loofah
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ca5c597d..69c5bd05 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,7 +39,7 @@ GEM
     fakefs (1.5.1)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.19.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mini_portile2 (2.8.0)

From 364e97adc1aed203190b2d053f6314e32d13ed63 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Dec 2022 09:55:12 +0000
Subject: [PATCH 41/85] Bump rails-html-sanitizer from 1.4.3 to 1.4.4

Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases)
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.3...v1.4.4)

---
updated-dependencies:
- dependency-name: rails-html-sanitizer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 69c5bd05..3c2f364b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,8 +54,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.5.0)

From 53efb9d504ae62f746ebb4439b028c982b2ac03e Mon Sep 17 00:00:00 2001
From: Peter Goldstein <peter.m.goldstein@gmail.com>
Date: Sun, 25 Dec 2022 19:50:30 -0500
Subject: [PATCH 42/85] Adds Ruby 3.2 to the CI matrix.

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 464e156f..dfd860b7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, '3.0', 3.1, head]
+        ruby: [2.7, '3.0', 3.1, 3.2, head]
         gemfile: [rubocop-next, rubocop-old]
     runs-on: ubuntu-latest
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps

From 711ae9e1d4925995304afd168028b9426f0c832c Mon Sep 17 00:00:00 2001
From: Joshua Pinter <joshuapinter@gmail.com>
Date: Tue, 27 Dec 2022 13:25:52 -0700
Subject: [PATCH 43/85] Format cache options in code backticks.

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ec6688d8..8ffe00cf 100644
--- a/README.md
+++ b/README.md
@@ -614,7 +614,7 @@ app/views/users/_graph.html.erb:27:37: Extra space detected where there should b
 
 ## Caching
 
-The cache is currently opt-in - to turn it on, use the --cache option:
+The cache is currently opt-in - to turn it on, use the `--cache` option:
 
 ```sh
 erblint --cache ./app
@@ -630,7 +630,7 @@ via the `--cache-dir` option. Cache filenames are computed with a hash of inform
 These files store instance attributes of the `CachedOffense` object, which only contain the `Offense` attributes
 necessary to restore the results of running `erb-lint` for output. The cache also automatically prunes outdated files each time it's run.
 
-You can also use the --clear-cache option to delete the cache file directory.
+You can also use the `--clear-cache` option to delete the cache file directory.
 
 ## License
 

From e42f1b311606d8d5cad11d0fc49745588cdbd067 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Jan 2023 08:55:54 +0000
Subject: [PATCH 44/85] Bump activesupport from 7.0.4 to 7.0.4.1 (#301)

---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3c2f364b..96a01a26 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,13 +12,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (7.0.4)
-      activesupport (= 7.0.4)
+    actionview (7.0.4.1)
+      activesupport (= 7.0.4.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.4)
+    activesupport (7.0.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -43,7 +43,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mini_portile2 (2.8.0)
-    minitest (5.16.3)
+    minitest (5.17.0)
     nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)

From 42c73be4aaf9f02cdeb60a17ba0a8617606f65f6 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Fri, 3 Feb 2023 11:02:10 -0800
Subject: [PATCH 45/85] Guard against missing config in ensure block

---
 lib/erb_lint/cli.rb              |  2 +-
 spec/erb_lint/cli_spec.rb        | 11 +++++++++++
 spec/fixtures/invalid-config.yml |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 spec/fixtures/invalid-config.yml

diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 21cc4477..6cb03395 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -221,7 +221,7 @@ def load_config
     rescue Psych::SyntaxError => e
       failure!("error parsing config: #{e.message}")
     ensure
-      @config.merge!(runner_config_override)
+      @config&.merge!(runner_config_override)
     end
 
     def file_loader
diff --git a/spec/erb_lint/cli_spec.rb b/spec/erb_lint/cli_spec.rb
index edbc6026..50da7582 100644
--- a/spec/erb_lint/cli_spec.rb
+++ b/spec/erb_lint/cli_spec.rb
@@ -146,6 +146,17 @@ def run(processed_source)
           expect(subject).to(be(true))
         end
       end
+
+      context "when file has a syntax error" do
+        before { FakeFS::FileSystem.clone(File.join(__dir__, "../fixtures"), "/") }
+
+        let(:args) { ["--config", "invalid-config.yml", "--lint-all"] }
+
+        it { expect { subject }.to(output(/error parsing config:/).to_stderr) }
+        it "is not successful" do
+          expect(subject).to(be(false))
+        end
+      end
     end
 
     context "with custom --cache-dir" do
diff --git a/spec/fixtures/invalid-config.yml b/spec/fixtures/invalid-config.yml
new file mode 100644
index 00000000..079b5796
--- /dev/null
+++ b/spec/fixtures/invalid-config.yml
@@ -0,0 +1 @@
+]

From 803026902e098cfdf8da8db708ee4b7934ec4aad Mon Sep 17 00:00:00 2001
From: Gabi Stefanini <gabriela.stefanini@shopify.com>
Date: Wed, 8 Feb 2023 15:25:22 -0500
Subject: [PATCH 46/85] Add Shopify's Contributor License Agreement (CLA)

---
 .github/workflows/cla.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .github/workflows/cla.yml

diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
new file mode 100644
index 00000000..2c3a4042
--- /dev/null
+++ b/.github/workflows/cla.yml
@@ -0,0 +1,22 @@
+name: Contributor License Agreement (CLA)
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+  issue_comment:
+    types: [created]
+
+jobs:
+  cla:
+    runs-on: ubuntu-latest
+    if: |
+      (github.event.issue.pull_request
+        && !github.event.issue.pull_request.merged_at
+        && contains(github.event.comment.body, 'signed')
+      )
+      || (github.event.pull_request && !github.event.pull_request.merged)
+    steps:
+      - uses: Shopify/shopify-cla-action@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cla-token: ${{ secrets.CLA_TOKEN }}

From 3fe240222ef678795e0ae7d83e38a4142774c0e6 Mon Sep 17 00:00:00 2001
From: Kate Higa <khiga8@github.com>
Date: Fri, 4 Feb 2022 10:58:30 -0800
Subject: [PATCH 47/85] Allow rule to be disabled by comment

This commit introduces a `run_and_clear_ignored_offenses` method which
filters out offenses which may include a comment in the format

```
<%# erblint:disable #{offense.linter.simple_class_name} %>
```

as either part of the offending lines, or as a comment in the previous line.
---
 lib/erb_lint/linter.rb | 14 ++++++++++++++
 lib/erb_lint/runner.rb |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
index 3d452c90..9458d6e2 100644
--- a/lib/erb_lint/linter.rb
+++ b/lib/erb_lint/linter.rb
@@ -53,6 +53,20 @@ def run(_processed_source)
       raise NotImplementedError, "must implement ##{__method__}"
     end
 
+    def clear_ignored_offenses(_processed_source)
+      @offenses = @offenses.reject do |offense|
+        source_range = offense.source_range
+        offending_lines = _processed_source.source_buffer.slice(source_range.range)
+        previous_line = _processed_source.source_buffer.source_lines[offense.source_range.line_range.first - 2]
+        offending_lines.match(/<%# erblint:disable #{offense.linter.simple_name} %>/) || previous_line.match(/<%# erblint:disable #{offense.linter.simple_name} %>/)
+      end
+    end
+
+    def run_and_clear_ignored_offenses(_processed_source)
+      run(_processed_source)
+      clear_ignored_offenses(_processed_source) if @offenses.any?
+    end
+
     def add_offense(source_range, message, context = nil, severity = nil)
       @offenses << Offense.new(self, source_range, message, context, severity)
     end
diff --git a/lib/erb_lint/runner.rb b/lib/erb_lint/runner.rb
index f769f25a..17e532f3 100644
--- a/lib/erb_lint/runner.rb
+++ b/lib/erb_lint/runner.rb
@@ -21,7 +21,7 @@ def run(processed_source)
       @linters
         .reject { |linter| linter.excludes_file?(processed_source.filename) }
         .each do |linter|
-        linter.run(processed_source)
+        linter.run_and_clear_ignored_offenses(processed_source)
         @offenses.concat(linter.offenses)
       end
     end

From dfc78e259dd44be4a50d4eda1656beeef577aac4 Mon Sep 17 00:00:00 2001
From: Kate Higa <khiga8@github.com>
Date: Fri, 4 Feb 2022 12:08:59 -0800
Subject: [PATCH 48/85] use lines instead of source range

---
 lib/erb_lint/linter.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
index 9458d6e2..b3b860c8 100644
--- a/lib/erb_lint/linter.rb
+++ b/lib/erb_lint/linter.rb
@@ -55,10 +55,10 @@ def run(_processed_source)
 
     def clear_ignored_offenses(_processed_source)
       @offenses = @offenses.reject do |offense|
-        source_range = offense.source_range
-        offending_lines = _processed_source.source_buffer.slice(source_range.range)
-        previous_line = _processed_source.source_buffer.source_lines[offense.source_range.line_range.first - 2]
-        offending_lines.match(/<%# erblint:disable #{offense.linter.simple_name} %>/) || previous_line.match(/<%# erblint:disable #{offense.linter.simple_name} %>/)
+        offending_line_ranges = offense.source_range.line_range
+        offending_lines =  _processed_source.source_buffer.source_lines[offending_line_ranges.first - 1..offending_line_ranges.last - 1].join
+        previous_line = _processed_source.source_buffer.source_lines[offending_line_ranges.first - 2]
+        offending_lines.match(/<%# erblint:disable #{offense.linter.class.simple_name} %>/) || previous_line.match(/<%# erblint:disable #{offense.linter.class.simple_name} %>/)
       end
     end
 

From 521d9234f275c119591142f28bf8b5b575f23cca Mon Sep 17 00:00:00 2001
From: Kate Higa <khiga8@github.com>
Date: Fri, 4 Feb 2022 17:45:45 -0800
Subject: [PATCH 49/85] add support for no_unused_disable linter

This commit adds support for the no_unused_disable linter.
This can be configured in `erb-lint.yml`.

If there are any unnecessary disable statements, these will be reported.

This is a special linter that must run after all other linters.
---
 lib/erb_lint/linter.rb                    | 17 ++++++----
 lib/erb_lint/linters/no_unused_disable.rb | 39 +++++++++++++++++++++++
 lib/erb_lint/offense.rb                   |  9 ++++++
 lib/erb_lint/runner.rb                    | 15 +++++++--
 4 files changed, 71 insertions(+), 9 deletions(-)
 create mode 100644 lib/erb_lint/linters/no_unused_disable.rb

diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
index b3b860c8..58f1c4c1 100644
--- a/lib/erb_lint/linter.rb
+++ b/lib/erb_lint/linter.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# frozen_string_literal: true
 
 module ERBLint
   # Defines common functionality available to all linters.
@@ -53,18 +54,20 @@ def run(_processed_source)
       raise NotImplementedError, "must implement ##{__method__}"
     end
 
-    def clear_ignored_offenses(_processed_source)
-      @offenses = @offenses.reject do |offense|
+    def set_offense_status(processed_source)
+      @offenses = @offenses.each do |offense|
         offending_line_ranges = offense.source_range.line_range
-        offending_lines =  _processed_source.source_buffer.source_lines[offending_line_ranges.first - 1..offending_line_ranges.last - 1].join
-        previous_line = _processed_source.source_buffer.source_lines[offending_line_ranges.first - 2]
-        offending_lines.match(/<%# erblint:disable #{offense.linter.class.simple_name} %>/) || previous_line.match(/<%# erblint:disable #{offense.linter.class.simple_name} %>/)
+        offending_lines =  processed_source.source_buffer.source_lines[offending_line_ranges.first - 1..offending_line_ranges.last - 1].join
+        previous_line = processed_source.source_buffer.source_lines[offense.source_range.line_range.first - 2]
+        if offending_lines.match(/<%# erblint:disable #{offense.linter.class.simple_name} %>/) || previous_line.match(/<%# erblint:disable #{offense.linter.class.simple_name} %>/)
+          offense.disabled = true
+        end
       end
     end
 
-    def run_and_clear_ignored_offenses(_processed_source)
+    def run_and_set_offense_status(_processed_source)
       run(_processed_source)
-      clear_ignored_offenses(_processed_source) if @offenses.any?
+      set_offense_status(_processed_source) if @offenses.any?
     end
 
     def add_offense(source_range, message, context = nil, severity = nil)
diff --git a/lib/erb_lint/linters/no_unused_disable.rb b/lib/erb_lint/linters/no_unused_disable.rb
new file mode 100644
index 00000000..15be56b0
--- /dev/null
+++ b/lib/erb_lint/linters/no_unused_disable.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module ERBLint
+    module Linters
+      # Checks for unused disable comments.
+      class NoUnusedDisable < Linter
+        include LinterRegistry
+  
+        def run(processed_source, offenses)
+          disabled_rules_and_line_number = {}
+  
+          processed_source.source_buffer.source_lines.each_with_index do |line, index|
+            rule_disable = line.match(/<%# erblint:disable (?<rules>.*) %>/)&& line.match(/<%# erblint:disable (?<rules>.*) %>/).named_captures['rules']
+            next unless rule_disable
+            rule_disable.split(',').each do |rule|
+              disabled_rules_and_line_number[rule] = (disabled_rules_and_line_number[rule] ||= []).push(index+1)
+            end
+          end
+  
+          offenses.each do |offense|
+            rule_name = offense.linter.class.simple_name
+            next unless line_numbers = disabled_rules_and_line_number[rule_name]
+            line_numbers = line_numbers.reject do |line_number|
+              if (offense.source_range.line_span.first-1..offense.source_range.line_span.last).include?(line_number)
+                disabled_rules_and_line_number[rule_name].delete(line_number)
+              end
+            end
+          end
+  
+          disabled_rules_and_line_number.each do |rule, line_numbers|
+            line_numbers.each do |line_number|
+              add_offense(processed_source.source_buffer.line_range(line_number), "Unused erblint:disable comment for #{rule}")
+            end
+          end
+        end
+      end
+    end
+  end
+  
\ No newline at end of file
diff --git a/lib/erb_lint/offense.rb b/lib/erb_lint/offense.rb
index 5c8db6b7..91d1bce5 100644
--- a/lib/erb_lint/offense.rb
+++ b/lib/erb_lint/offense.rb
@@ -15,6 +15,7 @@ def initialize(linter, source_range, message, context = nil, severity = nil)
       @message = message
       @context = context
       @severity = severity
+      @disabled = false
     end
 
     def to_cached_offense_hash
@@ -44,6 +45,14 @@ def line_number
       line_range.begin
     end
 
+    def disabled=(disabled)
+      @disabled = disabled
+    end
+
+    def disabled?
+      @disabled
+    end
+
     def column
       source_range.column
     end
diff --git a/lib/erb_lint/runner.rb b/lib/erb_lint/runner.rb
index 17e532f3..50547e15 100644
--- a/lib/erb_lint/runner.rb
+++ b/lib/erb_lint/runner.rb
@@ -10,7 +10,7 @@ def initialize(file_loader, config)
       @config = config || RunnerConfig.default
       raise ArgumentError, "expect `config` to be a RunnerConfig instance" unless @config.is_a?(RunnerConfig)
 
-      linter_classes = LinterRegistry.linters.select { |klass| @config.for_linter(klass).enabled? }
+      linter_classes = LinterRegistry.linters.select { |klass| @config.for_linter(klass).enabled? && klass != ERBLint::Linters::NoUnusedDisable }
       @linters = linter_classes.map do |linter_class|
         linter_class.new(@file_loader, @config.for_linter(linter_class))
       end
@@ -21,14 +21,25 @@ def run(processed_source)
       @linters
         .reject { |linter| linter.excludes_file?(processed_source.filename) }
         .each do |linter|
-        linter.run_and_clear_ignored_offenses(processed_source)
+        linter.run_and_set_offense_status(processed_source)
         @offenses.concat(linter.offenses)
       end
+      report_unused_disable(processed_source)
+      @offenses = @offenses.reject(&:disabled?)
+    end
+
+    def report_unused_disable(processed_source)
+      if LinterRegistry.linters.include?(ERBLint::Linters::NoUnusedDisable) && @config.for_linter(ERBLint::Linters::NoUnusedDisable).enabled?
+        @no_unused_disable = ERBLint::Linters::NoUnusedDisable.new(@file_loader, @config.for_linter(ERBLint::Linters::NoUnusedDisable))
+        @no_unused_disable.run(processed_source, @offenses)
+        @offenses.concat(@no_unused_disable.offenses)
+      end
     end
 
     def clear_offenses
       @offenses = []
       @linters.each(&:clear_offenses)
+      @no_unused_disable.clear_offenses if @no_unused_disable
     end
 
     def restore_offenses(offenses)

From 36cb98773213f1d4bc4a945ebc468798fbd5ff1a Mon Sep 17 00:00:00 2001
From: Kate Higa <khiga8@github.com>
Date: Sat, 5 Feb 2022 11:13:15 -0800
Subject: [PATCH 50/85] Add specs

---
 spec/erb_lint/runner_spec.rb | 109 ++++++++++++++++++++++++++++++++++-
 1 file changed, 107 insertions(+), 2 deletions(-)

diff --git a/spec/erb_lint/runner_spec.rb b/spec/erb_lint/runner_spec.rb
index 601ff535..c0ac3441 100644
--- a/spec/erb_lint/runner_spec.rb
+++ b/spec/erb_lint/runner_spec.rb
@@ -20,16 +20,26 @@ def run(processed_source)
           add_offense(processed_source.to_source_range(1..1), "#{self.class.name} error")
         end
       end
-
       class FakeLinter2 < FakeLinter1; end
     end
   end
 
+  let(:file_loader) { ERBLint::FileLoader.new(".") }
+  let(:runner) { described_class.new(file_loader, config) }  
+  
+
   describe "#run" do
+    before do
+      allow(ERBLint::LinterRegistry).to(receive(:linters)
+        .and_return([ERBLint::Linters::FakeLinter1,
+                     ERBLint::Linters::FakeLinter2,
+                     ERBLint::Linters::FinalNewline,]))
+      runner.run(processed_source)
+    end
+  
     let(:file) { "DummyFileContent" }
     let(:filename) { "/root/directory/somefolder/otherfolder/dummyfile.html.erb" }
     let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
-    before { runner.run(processed_source) }
     subject { runner.offenses }
 
     context "when all linters are enabled" do
@@ -132,4 +142,99 @@ class FakeLinter2 < FakeLinter1; end
       end
     end
   end
+
+  describe "#run with disabled comments" do
+    module ERBLint
+      module Linters
+        class FakeLinter3 < Linter
+          def run(processed_source)
+            second_line_range = processed_source.source_buffer.line_range(2).to_range # reports second line of file
+            add_offense(processed_source.to_source_range(second_line_range), "#{self.class.name} error")
+          end
+        end
+
+        class FakeLinter4 < FakeLinter3; end
+      end
+    end
+
+    before do
+      allow(ERBLint::LinterRegistry).to(receive(:linters)
+        .and_return([ERBLint::Linters::FakeLinter2,
+                     ERBLint::Linters::FakeLinter3,
+                     ERBLint::Linters::FakeLinter4]))
+      runner.run(processed_source)
+    end
+    subject { runner.offenses }
+
+    let(:config) do
+      ERBLint::RunnerConfig.new(
+        linters: {
+          "FakeLinter2" => { "enabled" => true },
+          "FakeLinter3" => { "enabled" => true },
+          "FakeLinter4" => { "enabled" => true }
+        }
+      )
+    end
+    
+    context "comment after offending lines" do 
+      let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
+      let(:file) { <<~FILE }
+        <div>something</div>
+        <span>bad content</span>
+        <%# erblint:disable FakeLinter3 %>
+      FILE
+      let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
+
+      it 'reports all offenses' do 
+        expect(subject.size).to(eq(3))
+        expect(subject[0].linter.class).to(eq(ERBLint::Linters::FakeLinter2))
+        expect(subject[1].linter.class).to(eq(ERBLint::Linters::FakeLinter3))
+        expect(subject[2].linter.class).to(eq(ERBLint::Linters::FakeLinter4))
+      end
+    end
+
+    context "comment on offending lines" do 
+      let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
+      let(:file) { <<~FILE }
+        <div>something</div>
+        <span>bad content</span><%# erblint:disable FakeLinter3 %>
+      FILE
+      let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
+
+      it 'does not report offense' do 
+        expect(subject.size).to(eq(2))
+        expect(subject[0].linter.class).to(eq(ERBLint::Linters::FakeLinter2))
+        expect(subject[1].linter.class).to(eq(ERBLint::Linters::FakeLinter4))
+      end
+    end
+
+    context "comment before offending lines" do 
+      let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
+      let(:file) { <<~FILE }
+        <%# erblint:disable FakeLinter3 %>
+        <span>bad content</span>
+      FILE
+      let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
+
+      it 'does not report offense' do 
+        expect(subject.size).to(eq(2))
+        expect(subject[0].linter.class).to(eq(ERBLint::Linters::FakeLinter2))
+        expect(subject[1].linter.class).to(eq(ERBLint::Linters::FakeLinter4))
+      end
+    end
+
+    context "comment for multiple rules" do 
+      let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
+      let(:file) { <<~FILE }
+        <%# erblint:disable FakeLinter3, FakeLinter4 %>
+        <span>bad content</span>
+      FILE
+      let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
+
+      it 'does not report offense', focus: true do 
+        expect(subject.size).to(eq(1))
+        expect(subject[0].linter.class).to(eq(ERBLint::Linters::FakeLinter2))
+      end
+    end
+  end
 end

From 0af4d51c107d2314297bce03d6c4b141f631ff49 Mon Sep 17 00:00:00 2001
From: Kate Higa <khiga8@github.com>
Date: Sat, 5 Feb 2022 11:13:40 -0800
Subject: [PATCH 51/85] update linter so tests pass

---
 lib/erb_lint/linter.rb | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
index 58f1c4c1..581520c2 100644
--- a/lib/erb_lint/linter.rb
+++ b/lib/erb_lint/linter.rb
@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# frozen_string_literal: true
 
 module ERBLint
   # Defines common functionality available to all linters.
@@ -56,15 +55,24 @@ def run(_processed_source)
 
     def set_offense_status(processed_source)
       @offenses = @offenses.each do |offense|
-        offending_line_ranges = offense.source_range.line_range
-        offending_lines =  processed_source.source_buffer.source_lines[offending_line_ranges.first - 1..offending_line_ranges.last - 1].join
-        previous_line = processed_source.source_buffer.source_lines[offense.source_range.line_range.first - 2]
-        if offending_lines.match(/<%# erblint:disable #{offense.linter.class.simple_name} %>/) || previous_line.match(/<%# erblint:disable #{offense.linter.class.simple_name} %>/)
+        offense_line_range = offense.source_range.line_range
+        offense_lines =  source_for_line_range(processed_source, offense_line_range)
+        previous_line = processed_source.source_buffer.source_lines[offense_line_range.first - 2]
+        
+        if rule_disable_comment?(offense_lines) || rule_disable_comment?(previous_line)
           offense.disabled = true
         end
       end
     end
 
+    def source_for_line_range(processed_source, line_range)
+      processed_source.source_buffer.source_lines[line_range.first - 1..line_range.last - 1].join
+    end
+
+    def rule_disable_comment?(lines)
+      lines.match(/<%# erblint:disable (?<rules>.*#{self.class.simple_name}).*%>/).present?
+    end
+
     def run_and_set_offense_status(_processed_source)
       run(_processed_source)
       set_offense_status(_processed_source) if @offenses.any?

From 80bfed6dea4e87cf09f3ad922289957a62b80d35 Mon Sep 17 00:00:00 2001
From: Kate Higa <khiga8@github.com>
Date: Sun, 6 Feb 2022 19:08:53 -0800
Subject: [PATCH 52/85] add test for no_unused_disable

---
 .../linters/no_unused_disable_spec.rb         | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 spec/erb_lint/linters/no_unused_disable_spec.rb

diff --git a/spec/erb_lint/linters/no_unused_disable_spec.rb b/spec/erb_lint/linters/no_unused_disable_spec.rb
new file mode 100644
index 00000000..a60af651
--- /dev/null
+++ b/spec/erb_lint/linters/no_unused_disable_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe ERBLint::Linters::NoUnusedDisable do
+  let(:linter_config) { described_class.config_schema.new }
+
+  let(:file_loader) { ERBLint::FileLoader.new(".") }
+  let(:linter) { described_class.new(file_loader, linter_config) }
+  let(:processed_source) { ERBLint::ProcessedSource.new("file.rb", file) }
+  let(:offenses) { linter.offenses }
+
+  module ERBLint
+    module Linters
+      class Fake < ERBLint::Linter
+        attr_accessor :offenses
+      end
+    end
+  end
+
+  describe "offenses" do
+    subject { offenses }
+    context "when file has unused disable comment" do
+      let(:file) { "<span></span><%# erblint:disable Fake %>" }
+      before { linter.run(processed_source, []) }
+      it do
+        expect(subject.size).to(eq(1))
+        expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake"))
+      end
+    end
+
+    context "when file has a disable comment and a corresponding offense" do
+      let(:file) { "<span></span><%# erblint:disable Fake %>" }
+      before do
+        offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
+          processed_source.to_source_range(1..6), "some fake linter message")
+        offense.disabled = true
+        linter.run(processed_source, [offense])
+      end
+
+      it "does not report anything" do
+        expect(subject.size).to(eq(0))
+      end
+    end
+
+    context "when file has disable comment for two rules" do
+      let(:file) { "<span></span><%# erblint:disable Fake, Fake2 %>" }
+      before do
+        offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
+          processed_source.to_source_range(1..6), "some fake linter message")
+        offense.disabled = true
+        linter.run(processed_source, [offense])
+      end
+
+      it "reports the unused rule" do
+        expect(subject.size).to(eq(1))
+        expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake2"))
+      end
+    end
+  end
+end

From 7274bd8743e9c74608290d603b231845aa296166 Mon Sep 17 00:00:00 2001
From: Kate Higa <khiga8@github.com>
Date: Sun, 6 Feb 2022 19:09:07 -0800
Subject: [PATCH 53/85] run rubocop and move to private methods

---
 lib/erb_lint/linter.rb                    | 34 +++++++------
 lib/erb_lint/linters/no_unused_disable.rb | 59 ++++++++++++-----------
 lib/erb_lint/offense.rb                   |  4 +-
 lib/erb_lint/runner.rb                    | 28 ++++++++---
 spec/erb_lint/runner_spec.rb              | 28 +++++------
 5 files changed, 84 insertions(+), 69 deletions(-)

diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
index 581520c2..cd33bf36 100644
--- a/lib/erb_lint/linter.rb
+++ b/lib/erb_lint/linter.rb
@@ -53,12 +53,27 @@ def run(_processed_source)
       raise NotImplementedError, "must implement ##{__method__}"
     end
 
-    def set_offense_status(processed_source)
+    def run_and_update_offense_status(processed_source)
+      run(processed_source)
+      update_offense_status(processed_source) if @offenses.any?
+    end
+
+    def add_offense(source_range, message, context = nil, severity = nil)
+      @offenses << Offense.new(self, source_range, message, context, severity)
+    end
+
+    def clear_offenses
+      @offenses = []
+    end
+
+    private
+
+    def update_offense_status(processed_source)
       @offenses = @offenses.each do |offense|
         offense_line_range = offense.source_range.line_range
-        offense_lines =  source_for_line_range(processed_source, offense_line_range)
+        offense_lines = source_for_line_range(processed_source, offense_line_range)
         previous_line = processed_source.source_buffer.source_lines[offense_line_range.first - 2]
-        
+
         if rule_disable_comment?(offense_lines) || rule_disable_comment?(previous_line)
           offense.disabled = true
         end
@@ -72,18 +87,5 @@ def source_for_line_range(processed_source, line_range)
     def rule_disable_comment?(lines)
       lines.match(/<%# erblint:disable (?<rules>.*#{self.class.simple_name}).*%>/).present?
     end
-
-    def run_and_set_offense_status(_processed_source)
-      run(_processed_source)
-      set_offense_status(_processed_source) if @offenses.any?
-    end
-
-    def add_offense(source_range, message, context = nil, severity = nil)
-      @offenses << Offense.new(self, source_range, message, context, severity)
-    end
-
-    def clear_offenses
-      @offenses = []
-    end
   end
 end
diff --git a/lib/erb_lint/linters/no_unused_disable.rb b/lib/erb_lint/linters/no_unused_disable.rb
index 15be56b0..1c22a843 100644
--- a/lib/erb_lint/linters/no_unused_disable.rb
+++ b/lib/erb_lint/linters/no_unused_disable.rb
@@ -1,39 +1,42 @@
 # frozen_string_literal: true
 
 module ERBLint
-    module Linters
-      # Checks for unused disable comments.
-      class NoUnusedDisable < Linter
-        include LinterRegistry
-  
-        def run(processed_source, offenses)
-          disabled_rules_and_line_number = {}
-  
-          processed_source.source_buffer.source_lines.each_with_index do |line, index|
-            rule_disable = line.match(/<%# erblint:disable (?<rules>.*) %>/)&& line.match(/<%# erblint:disable (?<rules>.*) %>/).named_captures['rules']
-            next unless rule_disable
-            rule_disable.split(',').each do |rule|
-              disabled_rules_and_line_number[rule] = (disabled_rules_and_line_number[rule] ||= []).push(index+1)
-            end
+  module Linters
+    # Checks for unused disable comments.
+    class NoUnusedDisable < Linter
+      include LinterRegistry
+
+      def run(processed_source, offenses)
+        disabled_rules_and_line_number = {}
+
+        processed_source.source_buffer.source_lines.each_with_index do |line, index|
+          rule_disable = line.match(/<%# erblint:disable (?<rules>.*) %>/) &&
+            line.match(/<%# erblint:disable (?<rules>.*) %>/).named_captures["rules"]
+          next unless rule_disable
+          rule_disable.split(",").each do |rule|
+            disabled_rules_and_line_number[rule.strip] =
+              (disabled_rules_and_line_number[rule.strip] ||= []).push(index + 1)
           end
-  
-          offenses.each do |offense|
-            rule_name = offense.linter.class.simple_name
-            next unless line_numbers = disabled_rules_and_line_number[rule_name]
-            line_numbers = line_numbers.reject do |line_number|
-              if (offense.source_range.line_span.first-1..offense.source_range.line_span.last).include?(line_number)
-                disabled_rules_and_line_number[rule_name].delete(line_number)
-              end
+        end
+
+        offenses.each do |offense|
+          rule_name = offense.linter.class.simple_name
+          line_numbers = disabled_rules_and_line_number[rule_name]
+          next unless line_numbers
+          line_numbers.reject do |line_number|
+            if (offense.source_range.line_span.first - 1..offense.source_range.line_span.last).include?(line_number)
+              disabled_rules_and_line_number[rule_name].delete(line_number)
             end
           end
-  
-          disabled_rules_and_line_number.each do |rule, line_numbers|
-            line_numbers.each do |line_number|
-              add_offense(processed_source.source_buffer.line_range(line_number), "Unused erblint:disable comment for #{rule}")
-            end
+        end
+
+        disabled_rules_and_line_number.each do |rule, line_numbers|
+          line_numbers.each do |line_number|
+            add_offense(processed_source.source_buffer.line_range(line_number),
+              "Unused erblint:disable comment for #{rule}")
           end
         end
       end
     end
   end
-  
\ No newline at end of file
+end
diff --git a/lib/erb_lint/offense.rb b/lib/erb_lint/offense.rb
index 91d1bce5..07f9eef6 100644
--- a/lib/erb_lint/offense.rb
+++ b/lib/erb_lint/offense.rb
@@ -45,9 +45,7 @@ def line_number
       line_range.begin
     end
 
-    def disabled=(disabled)
-      @disabled = disabled
-    end
+    attr_writer :disabled
 
     def disabled?
       @disabled
diff --git a/lib/erb_lint/runner.rb b/lib/erb_lint/runner.rb
index 50547e15..7f9b4774 100644
--- a/lib/erb_lint/runner.rb
+++ b/lib/erb_lint/runner.rb
@@ -10,7 +10,9 @@ def initialize(file_loader, config)
       @config = config || RunnerConfig.default
       raise ArgumentError, "expect `config` to be a RunnerConfig instance" unless @config.is_a?(RunnerConfig)
 
-      linter_classes = LinterRegistry.linters.select { |klass| @config.for_linter(klass).enabled? && klass != ERBLint::Linters::NoUnusedDisable }
+      linter_classes = LinterRegistry.linters.select do |klass|
+        @config.for_linter(klass).enabled? && klass != ERBLint::Linters::NoUnusedDisable
+      end
       @linters = linter_classes.map do |linter_class|
         linter_class.new(@file_loader, @config.for_linter(linter_class))
       end
@@ -21,16 +23,30 @@ def run(processed_source)
       @linters
         .reject { |linter| linter.excludes_file?(processed_source.filename) }
         .each do |linter|
-        linter.run_and_set_offense_status(processed_source)
+        linter.run_and_update_offense_status(processed_source)
         @offenses.concat(linter.offenses)
       end
       report_unused_disable(processed_source)
       @offenses = @offenses.reject(&:disabled?)
     end
 
+    def clear_offenses
+      @offenses = []
+      @linters.each(&:clear_offenses)
+      @no_unused_disable&.clear_offenses
+    end
+    
+    def restore_offenses(offenses)
+      @offenses.concat(offenses)
+    end
+
+    private
+
     def report_unused_disable(processed_source)
-      if LinterRegistry.linters.include?(ERBLint::Linters::NoUnusedDisable) && @config.for_linter(ERBLint::Linters::NoUnusedDisable).enabled?
-        @no_unused_disable = ERBLint::Linters::NoUnusedDisable.new(@file_loader, @config.for_linter(ERBLint::Linters::NoUnusedDisable))
+      if LinterRegistry.linters.include?(ERBLint::Linters::NoUnusedDisable) &&
+        @config.for_linter(ERBLint::Linters::NoUnusedDisable).enabled?
+        @no_unused_disable = ERBLint::Linters::NoUnusedDisable.new(@file_loader,
+          @config.for_linter(ERBLint::Linters::NoUnusedDisable))
         @no_unused_disable.run(processed_source, @offenses)
         @offenses.concat(@no_unused_disable.offenses)
       end
@@ -41,9 +57,5 @@ def clear_offenses
       @linters.each(&:clear_offenses)
       @no_unused_disable.clear_offenses if @no_unused_disable
     end
-
-    def restore_offenses(offenses)
-      @offenses.concat(offenses)
-    end
   end
 end
diff --git a/spec/erb_lint/runner_spec.rb b/spec/erb_lint/runner_spec.rb
index c0ac3441..2e379837 100644
--- a/spec/erb_lint/runner_spec.rb
+++ b/spec/erb_lint/runner_spec.rb
@@ -20,13 +20,13 @@ def run(processed_source)
           add_offense(processed_source.to_source_range(1..1), "#{self.class.name} error")
         end
       end
+
       class FakeLinter2 < FakeLinter1; end
     end
   end
 
   let(:file_loader) { ERBLint::FileLoader.new(".") }
-  let(:runner) { described_class.new(file_loader, config) }  
-  
+  let(:runner) { described_class.new(file_loader, config) }
 
   describe "#run" do
     before do
@@ -36,7 +36,7 @@ class FakeLinter2 < FakeLinter1; end
                      ERBLint::Linters::FinalNewline,]))
       runner.run(processed_source)
     end
-  
+
     let(:file) { "DummyFileContent" }
     let(:filename) { "/root/directory/somefolder/otherfolder/dummyfile.html.erb" }
     let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
@@ -161,7 +161,7 @@ class FakeLinter4 < FakeLinter3; end
       allow(ERBLint::LinterRegistry).to(receive(:linters)
         .and_return([ERBLint::Linters::FakeLinter2,
                      ERBLint::Linters::FakeLinter3,
-                     ERBLint::Linters::FakeLinter4]))
+                     ERBLint::Linters::FakeLinter4,]))
       runner.run(processed_source)
     end
     subject { runner.offenses }
@@ -171,12 +171,12 @@ class FakeLinter4 < FakeLinter3; end
         linters: {
           "FakeLinter2" => { "enabled" => true },
           "FakeLinter3" => { "enabled" => true },
-          "FakeLinter4" => { "enabled" => true }
+          "FakeLinter4" => { "enabled" => true },
         }
       )
     end
-    
-    context "comment after offending lines" do 
+
+    context "comment after offending lines" do
       let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
       let(:file) { <<~FILE }
         <div>something</div>
@@ -185,7 +185,7 @@ class FakeLinter4 < FakeLinter3; end
       FILE
       let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
 
-      it 'reports all offenses' do 
+      it "reports all offenses" do
         expect(subject.size).to(eq(3))
         expect(subject[0].linter.class).to(eq(ERBLint::Linters::FakeLinter2))
         expect(subject[1].linter.class).to(eq(ERBLint::Linters::FakeLinter3))
@@ -193,7 +193,7 @@ class FakeLinter4 < FakeLinter3; end
       end
     end
 
-    context "comment on offending lines" do 
+    context "comment on offending lines" do
       let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
       let(:file) { <<~FILE }
         <div>something</div>
@@ -201,14 +201,14 @@ class FakeLinter4 < FakeLinter3; end
       FILE
       let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
 
-      it 'does not report offense' do 
+      it "does not report offense" do
         expect(subject.size).to(eq(2))
         expect(subject[0].linter.class).to(eq(ERBLint::Linters::FakeLinter2))
         expect(subject[1].linter.class).to(eq(ERBLint::Linters::FakeLinter4))
       end
     end
 
-    context "comment before offending lines" do 
+    context "comment before offending lines" do
       let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
       let(:file) { <<~FILE }
         <%# erblint:disable FakeLinter3 %>
@@ -216,14 +216,14 @@ class FakeLinter4 < FakeLinter3; end
       FILE
       let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
 
-      it 'does not report offense' do 
+      it "does not report offense" do
         expect(subject.size).to(eq(2))
         expect(subject[0].linter.class).to(eq(ERBLint::Linters::FakeLinter2))
         expect(subject[1].linter.class).to(eq(ERBLint::Linters::FakeLinter4))
       end
     end
 
-    context "comment for multiple rules" do 
+    context "comment for multiple rules" do
       let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
       let(:file) { <<~FILE }
         <%# erblint:disable FakeLinter3, FakeLinter4 %>
@@ -231,7 +231,7 @@ class FakeLinter4 < FakeLinter3; end
       FILE
       let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
 
-      it 'does not report offense', focus: true do 
+      it "does not report offense", focus: true do
         expect(subject.size).to(eq(1))
         expect(subject[0].linter.class).to(eq(ERBLint::Linters::FakeLinter2))
       end

From f32e7fe725ccf7bff4eab51d52610d6e4d5e53db Mon Sep 17 00:00:00 2001
From: Kate Higa <khiga8@github.com>
Date: Wed, 2 Mar 2022 19:55:26 -0800
Subject: [PATCH 54/85] clean up no_unused_disable and add additional test

---
 lib/erb_lint/linters/no_unused_disable.rb     |  9 +++++--
 .../linters/no_unused_disable_spec.rb         | 24 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/lib/erb_lint/linters/no_unused_disable.rb b/lib/erb_lint/linters/no_unused_disable.rb
index 1c22a843..dc60e192 100644
--- a/lib/erb_lint/linters/no_unused_disable.rb
+++ b/lib/erb_lint/linters/no_unused_disable.rb
@@ -10,8 +10,7 @@ def run(processed_source, offenses)
         disabled_rules_and_line_number = {}
 
         processed_source.source_buffer.source_lines.each_with_index do |line, index|
-          rule_disable = line.match(/<%# erblint:disable (?<rules>.*) %>/) &&
-            line.match(/<%# erblint:disable (?<rules>.*) %>/).named_captures["rules"]
+          rule_disable = disable_comment(line)
           next unless rule_disable
           rule_disable.split(",").each do |rule|
             disabled_rules_and_line_number[rule.strip] =
@@ -37,6 +36,12 @@ def run(processed_source, offenses)
           end
         end
       end
+
+      private
+
+      def disable_comment(line)
+        line.match(/<%# erblint:disable (?<rules>.*) %>/)&.named_captures&.fetch("rules")
+      end
     end
   end
 end
diff --git a/spec/erb_lint/linters/no_unused_disable_spec.rb b/spec/erb_lint/linters/no_unused_disable_spec.rb
index a60af651..02d38f3b 100644
--- a/spec/erb_lint/linters/no_unused_disable_spec.rb
+++ b/spec/erb_lint/linters/no_unused_disable_spec.rb
@@ -43,7 +43,7 @@ class Fake < ERBLint::Linter
       end
     end
 
-    context "when file has disable comment for two rules" do
+    context "when file has disable comment for multiple rules" do
       let(:file) { "<span></span><%# erblint:disable Fake, Fake2 %>" }
       before do
         offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
@@ -57,5 +57,27 @@ class Fake < ERBLint::Linter
         expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake2"))
       end
     end
+
+    context "when file has multiple disable comments for one offense" do
+      let(:file) { <<~ERB }
+        <%# erblint:disable Fake %>
+        <span></span><%# erblint:disable Fake %>
+      ERB
+      before do
+        second_line_range = processed_source.source_buffer.line_range(2).to_range
+        offense = ERBLint::Offense.new(
+          ERBLint::Linters::Fake.new(file_loader, linter_config),
+          processed_source.to_source_range(second_line_range),
+          "some fake linter message"
+        )
+        offense.disabled = true
+        linter.run(processed_source, [offense])
+      end
+
+      it "reports the unused rule" do
+        expect(subject.size).to(eq(1))
+        expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake"))
+      end
+    end
   end
 end

From bb56d0fa5225ef532bb8040ff3e31fba109686e0 Mon Sep 17 00:00:00 2001
From: Kate Higa <khiga8@github.com>
Date: Wed, 2 Mar 2022 19:55:42 -0800
Subject: [PATCH 55/85] update README

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 8ffe00cf..fced5c5c 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,22 @@ Make sure to add `**/` to exclude patterns; it matches the target files' absolut
 ## Enable or disable default linters
 `EnableDefaultLinters`: enables or disables default linters. [Default linters](#Linters) are enabled by default.
 
+## Disable rule at offense-level
+You can disable a rule by placing a disable comment in the following formats:
+
+1. Comment on offending lines
+```.erb
+<hr /> <%# erblint:disable SelfClosingTag %>
+```
+
+2. Comment on previous lines
+```.erb
+<%# erblint:disable SelfClosingTag %>
+<hr />
+```
+
+To raise an error when there is a useless disable comment, enable `NoUnusedDisable`.
+
 ## Exclude
 
 You can specify the exclude patterns both of global and lint-local.

From 1120eb5f56e202fc924ab48ec7ed238c3e792555 Mon Sep 17 00:00:00 2001
From: Kate Higa <khiga8@github.com>
Date: Wed, 16 Mar 2022 17:20:29 -0700
Subject: [PATCH 56/85] * Address review comments from @rafaelfranca

---
 lib/erb_lint/linter.rb |  4 ++--
 lib/erb_lint/runner.rb | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
index cd33bf36..f67fa3cc 100644
--- a/lib/erb_lint/linter.rb
+++ b/lib/erb_lint/linter.rb
@@ -69,7 +69,7 @@ def clear_offenses
     private
 
     def update_offense_status(processed_source)
-      @offenses = @offenses.each do |offense|
+      @offenses.each do |offense|
         offense_line_range = offense.source_range.line_range
         offense_lines = source_for_line_range(processed_source, offense_line_range)
         previous_line = processed_source.source_buffer.source_lines[offense_line_range.first - 2]
@@ -85,7 +85,7 @@ def source_for_line_range(processed_source, line_range)
     end
 
     def rule_disable_comment?(lines)
-      lines.match(/<%# erblint:disable (?<rules>.*#{self.class.simple_name}).*%>/).present?
+      lines.match(/<%# erblint:disable (?<rules>.*#{self.class.simple_name}).*%>/)
     end
   end
 end
diff --git a/lib/erb_lint/runner.rb b/lib/erb_lint/runner.rb
index 7f9b4774..cab7b0f3 100644
--- a/lib/erb_lint/runner.rb
+++ b/lib/erb_lint/runner.rb
@@ -16,6 +16,7 @@ def initialize(file_loader, config)
       @linters = linter_classes.map do |linter_class|
         linter_class.new(@file_loader, @config.for_linter(linter_class))
       end
+      @no_unused_disable = nil
       @offenses = []
     end
 
@@ -42,10 +43,15 @@ def restore_offenses(offenses)
 
     private
 
-    def report_unused_disable(processed_source)
-      if LinterRegistry.linters.include?(ERBLint::Linters::NoUnusedDisable) &&
+    def no_unused_disable_enabled?
+      LinterRegistry.linters.include?(ERBLint::Linters::NoUnusedDisable) &&
         @config.for_linter(ERBLint::Linters::NoUnusedDisable).enabled?
-        @no_unused_disable = ERBLint::Linters::NoUnusedDisable.new(@file_loader,
+    end
+
+    def report_unused_disable(processed_source)
+      if no_unused_disable_enabled?
+        @no_unused_disable = ERBLint::Linters::NoUnusedDisable.new(
+          @file_loader,
           @config.for_linter(ERBLint::Linters::NoUnusedDisable))
         @no_unused_disable.run(processed_source, @offenses)
         @offenses.concat(@no_unused_disable.offenses)

From 8e15f069ce6cd0e0db159aa40dd79772310e21cf Mon Sep 17 00:00:00 2001
From: Kate Higa <khiga8@github.com>
Date: Sun, 27 Mar 2022 13:37:15 -0700
Subject: [PATCH 57/85] * Only allow comment on offending lines

---
 README.md                                     | 10 ++--------
 lib/erb_lint/linter.rb                        |  3 +--
 lib/erb_lint/linters/no_unused_disable.rb     |  2 +-
 lib/erb_lint/runner.rb                        |  3 ++-
 .../linters/no_unused_disable_spec.rb         | 18 ++++++++++++++++++
 spec/erb_lint/runner_spec.rb                  | 19 ++-----------------
 6 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index fced5c5c..fd18e5dd 100644
--- a/README.md
+++ b/README.md
@@ -75,19 +75,13 @@ Make sure to add `**/` to exclude patterns; it matches the target files' absolut
 `EnableDefaultLinters`: enables or disables default linters. [Default linters](#Linters) are enabled by default.
 
 ## Disable rule at offense-level
-You can disable a rule by placing a disable comment in the following formats:
+You can disable a rule by placing a disable comment in the following format:
 
-1. Comment on offending lines
+Comment on offending lines
 ```.erb
 <hr /> <%# erblint:disable SelfClosingTag %>
 ```
 
-2. Comment on previous lines
-```.erb
-<%# erblint:disable SelfClosingTag %>
-<hr />
-```
-
 To raise an error when there is a useless disable comment, enable `NoUnusedDisable`.
 
 ## Exclude
diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
index f67fa3cc..42a7b14f 100644
--- a/lib/erb_lint/linter.rb
+++ b/lib/erb_lint/linter.rb
@@ -72,9 +72,8 @@ def update_offense_status(processed_source)
       @offenses.each do |offense|
         offense_line_range = offense.source_range.line_range
         offense_lines = source_for_line_range(processed_source, offense_line_range)
-        previous_line = processed_source.source_buffer.source_lines[offense_line_range.first - 2]
 
-        if rule_disable_comment?(offense_lines) || rule_disable_comment?(previous_line)
+        if rule_disable_comment?(offense_lines)
           offense.disabled = true
         end
       end
diff --git a/lib/erb_lint/linters/no_unused_disable.rb b/lib/erb_lint/linters/no_unused_disable.rb
index dc60e192..84c05d1b 100644
--- a/lib/erb_lint/linters/no_unused_disable.rb
+++ b/lib/erb_lint/linters/no_unused_disable.rb
@@ -23,7 +23,7 @@ def run(processed_source, offenses)
           line_numbers = disabled_rules_and_line_number[rule_name]
           next unless line_numbers
           line_numbers.reject do |line_number|
-            if (offense.source_range.line_span.first - 1..offense.source_range.line_span.last).include?(line_number)
+            if (offense.source_range.line_span.first..offense.source_range.line_span.last).include?(line_number)
               disabled_rules_and_line_number[rule_name].delete(line_number)
             end
           end
diff --git a/lib/erb_lint/runner.rb b/lib/erb_lint/runner.rb
index cab7b0f3..ec3cbaf9 100644
--- a/lib/erb_lint/runner.rb
+++ b/lib/erb_lint/runner.rb
@@ -52,7 +52,8 @@ def report_unused_disable(processed_source)
       if no_unused_disable_enabled?
         @no_unused_disable = ERBLint::Linters::NoUnusedDisable.new(
           @file_loader,
-          @config.for_linter(ERBLint::Linters::NoUnusedDisable))
+          @config.for_linter(ERBLint::Linters::NoUnusedDisable)
+        )
         @no_unused_disable.run(processed_source, @offenses)
         @offenses.concat(@no_unused_disable.offenses)
       end
diff --git a/spec/erb_lint/linters/no_unused_disable_spec.rb b/spec/erb_lint/linters/no_unused_disable_spec.rb
index 02d38f3b..5979fefb 100644
--- a/spec/erb_lint/linters/no_unused_disable_spec.rb
+++ b/spec/erb_lint/linters/no_unused_disable_spec.rb
@@ -43,6 +43,24 @@ class Fake < ERBLint::Linter
       end
     end
 
+    context "when file has a disable comment in wrong place and a corresponding offense" do
+      let(:file) { <<~FILE }
+        <%# erblint:disable Fake %>
+        <span>bad content</span>
+      FILE
+      before do
+        offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
+          processed_source.to_source_range(28..52), "some fake linter message")
+        offense.disabled = true
+        linter.run(processed_source, [offense])
+      end
+
+      it "reports the unused rule" do
+        expect(subject.size).to(eq(1))
+        expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake"))
+      end
+    end
+
     context "when file has disable comment for multiple rules" do
       let(:file) { "<span></span><%# erblint:disable Fake, Fake2 %>" }
       before do
diff --git a/spec/erb_lint/runner_spec.rb b/spec/erb_lint/runner_spec.rb
index 2e379837..ddb344fe 100644
--- a/spec/erb_lint/runner_spec.rb
+++ b/spec/erb_lint/runner_spec.rb
@@ -208,26 +208,11 @@ class FakeLinter4 < FakeLinter3; end
       end
     end
 
-    context "comment before offending lines" do
-      let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
-      let(:file) { <<~FILE }
-        <%# erblint:disable FakeLinter3 %>
-        <span>bad content</span>
-      FILE
-      let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
-
-      it "does not report offense" do
-        expect(subject.size).to(eq(2))
-        expect(subject[0].linter.class).to(eq(ERBLint::Linters::FakeLinter2))
-        expect(subject[1].linter.class).to(eq(ERBLint::Linters::FakeLinter4))
-      end
-    end
-
     context "comment for multiple rules" do
       let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
       let(:file) { <<~FILE }
-        <%# erblint:disable FakeLinter3, FakeLinter4 %>
-        <span>bad content</span>
+        <div>something</div>
+        <span>bad content</span> <%# erblint:disable FakeLinter3, FakeLinter4 %>
       FILE
       let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
 

From dc9c8d4ca4866197bb16bfe1cd7650c4c43ccd54 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Fri, 3 Mar 2023 09:51:39 -0500
Subject: [PATCH 58/85] * Add support for reporting that ignores inline
 comments

---
 lib/erb_lint/cli.rb    |  7 ++++++-
 lib/erb_lint/linter.rb |  6 ++++--
 lib/erb_lint/runner.rb | 11 ++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 6cb03395..be620d11 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -69,6 +69,7 @@ def run(args = ARGV)
 
       @options[:format] ||= :multiline
       @options[:fail_level] ||= severity_level_for_name(:refactor)
+      @options[:disable_inline_config] ||= false
       @stats.files = lint_files.size
       @stats.linters = enabled_linter_classes.size
       @stats.autocorrectable_linters = enabled_linter_classes.count(&:support_autocorrect?)
@@ -76,7 +77,7 @@ def run(args = ARGV)
       reporter = Reporter.create_reporter(@options[:format], @stats, autocorrect?)
       reporter.preview
 
-      runner = ERBLint::Runner.new(file_loader, @config)
+      runner = ERBLint::Runner.new(file_loader, @config, @options[:disable_inline_config] || false)
       file_content = nil
 
       lint_files.each do |filename|
@@ -374,6 +375,10 @@ def option_parser
           @options[:allow_no_files] = config
         end
 
+        opts.on("--disable-inline-config", "Report all offenses while ignoring inline disable comments") do
+          @options[:disable_inline_config] = true
+        end
+
         opts.on(
           "-sFILE",
           "--stdin FILE",
diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
index 42a7b14f..8676e470 100644
--- a/lib/erb_lint/linter.rb
+++ b/lib/erb_lint/linter.rb
@@ -53,9 +53,11 @@ def run(_processed_source)
       raise NotImplementedError, "must implement ##{__method__}"
     end
 
-    def run_and_update_offense_status(processed_source)
+    def run_and_update_offense_status(processed_source, enable_inline_config = true)
       run(processed_source)
-      update_offense_status(processed_source) if @offenses.any?
+      if @offenses.any? && enable_inline_config
+        update_offense_status(processed_source)
+      end
     end
 
     def add_offense(source_range, message, context = nil, severity = nil)
diff --git a/lib/erb_lint/runner.rb b/lib/erb_lint/runner.rb
index ec3cbaf9..97c9f862 100644
--- a/lib/erb_lint/runner.rb
+++ b/lib/erb_lint/runner.rb
@@ -5,7 +5,7 @@ module ERBLint
   class Runner
     attr_reader :offenses
 
-    def initialize(file_loader, config)
+    def initialize(file_loader, config, disable_inline_config = false)
       @file_loader = file_loader
       @config = config || RunnerConfig.default
       raise ArgumentError, "expect `config` to be a RunnerConfig instance" unless @config.is_a?(RunnerConfig)
@@ -17,6 +17,7 @@ def initialize(file_loader, config)
         linter_class.new(@file_loader, @config.for_linter(linter_class))
       end
       @no_unused_disable = nil
+      @disable_inline_config = disable_inline_config
       @offenses = []
     end
 
@@ -24,7 +25,7 @@ def run(processed_source)
       @linters
         .reject { |linter| linter.excludes_file?(processed_source.filename) }
         .each do |linter|
-        linter.run_and_update_offense_status(processed_source)
+        linter.run_and_update_offense_status(processed_source, enable_inline_config?)
         @offenses.concat(linter.offenses)
       end
       report_unused_disable(processed_source)
@@ -43,13 +44,17 @@ def restore_offenses(offenses)
 
     private
 
+    def enable_inline_config?
+      !@disable_inline_config
+    end
+
     def no_unused_disable_enabled?
       LinterRegistry.linters.include?(ERBLint::Linters::NoUnusedDisable) &&
         @config.for_linter(ERBLint::Linters::NoUnusedDisable).enabled?
     end
 
     def report_unused_disable(processed_source)
-      if no_unused_disable_enabled?
+      if no_unused_disable_enabled? && enable_inline_config?
         @no_unused_disable = ERBLint::Linters::NoUnusedDisable.new(
           @file_loader,
           @config.for_linter(ERBLint::Linters::NoUnusedDisable)

From fddd8832d1366c7d6bd3ada8e6c51449be6dffc4 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Fri, 3 Mar 2023 09:53:25 -0500
Subject: [PATCH 59/85] * Update README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index fd18e5dd..4384621a 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,8 @@ Comment on offending lines
 
 To raise an error when there is a useless disable comment, enable `NoUnusedDisable`.
 
+To disable inline comments and report all offenses, set `--no-inline-disable` option.
+
 ## Exclude
 
 You can specify the exclude patterns both of global and lint-local.

From 820f805dea06faeddd2dc9639bcd612eefb67701 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Fri, 3 Mar 2023 10:17:44 -0500
Subject: [PATCH 60/85] * Clean files

---
 lib/erb_lint/cli.rb    | 2 +-
 lib/erb_lint/runner.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index be620d11..2a112ee8 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -77,7 +77,7 @@ def run(args = ARGV)
       reporter = Reporter.create_reporter(@options[:format], @stats, autocorrect?)
       reporter.preview
 
-      runner = ERBLint::Runner.new(file_loader, @config, @options[:disable_inline_config] || false)
+      runner = ERBLint::Runner.new(file_loader, @config, @options[:disable_inline_config])
       file_content = nil
 
       lint_files.each do |filename|
diff --git a/lib/erb_lint/runner.rb b/lib/erb_lint/runner.rb
index 97c9f862..07687618 100644
--- a/lib/erb_lint/runner.rb
+++ b/lib/erb_lint/runner.rb
@@ -37,7 +37,7 @@ def clear_offenses
       @linters.each(&:clear_offenses)
       @no_unused_disable&.clear_offenses
     end
-    
+
     def restore_offenses(offenses)
       @offenses.concat(offenses)
     end

From f5d5b6644eff02e4ec30a08e0082848ff272ccfd Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Fri, 3 Mar 2023 10:22:17 -0500
Subject: [PATCH 61/85] * Remove redundant call, fix merge conflict gone wrong

---
 lib/erb_lint/runner.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/erb_lint/runner.rb b/lib/erb_lint/runner.rb
index 07687618..c1136d12 100644
--- a/lib/erb_lint/runner.rb
+++ b/lib/erb_lint/runner.rb
@@ -63,11 +63,5 @@ def report_unused_disable(processed_source)
         @offenses.concat(@no_unused_disable.offenses)
       end
     end
-
-    def clear_offenses
-      @offenses = []
-      @linters.each(&:clear_offenses)
-      @no_unused_disable.clear_offenses if @no_unused_disable
-    end
   end
 end

From d2656013759652efa1ae502597603813c7b0d620 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Fri, 3 Mar 2023 10:28:07 -0500
Subject: [PATCH 62/85] * Fix merge conflict blunder

---
 spec/erb_lint/runner_spec.rb | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/spec/erb_lint/runner_spec.rb b/spec/erb_lint/runner_spec.rb
index ddb344fe..a529d19d 100644
--- a/spec/erb_lint/runner_spec.rb
+++ b/spec/erb_lint/runner_spec.rb
@@ -25,21 +25,11 @@ class FakeLinter2 < FakeLinter1; end
     end
   end
 
-  let(:file_loader) { ERBLint::FileLoader.new(".") }
-  let(:runner) { described_class.new(file_loader, config) }
-
   describe "#run" do
-    before do
-      allow(ERBLint::LinterRegistry).to(receive(:linters)
-        .and_return([ERBLint::Linters::FakeLinter1,
-                     ERBLint::Linters::FakeLinter2,
-                     ERBLint::Linters::FinalNewline,]))
-      runner.run(processed_source)
-    end
-
     let(:file) { "DummyFileContent" }
     let(:filename) { "/root/directory/somefolder/otherfolder/dummyfile.html.erb" }
     let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
+    before { runner.run(processed_source) }
     subject { runner.offenses }
 
     context "when all linters are enabled" do

From 28eb15fcb84bf92f1923d5c4cab18449fbd5c77e Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Fri, 3 Mar 2023 10:33:09 -0500
Subject: [PATCH 63/85] * Update test description

---
 spec/erb_lint/linters/no_unused_disable_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/erb_lint/linters/no_unused_disable_spec.rb b/spec/erb_lint/linters/no_unused_disable_spec.rb
index 5979fefb..b23550e1 100644
--- a/spec/erb_lint/linters/no_unused_disable_spec.rb
+++ b/spec/erb_lint/linters/no_unused_disable_spec.rb
@@ -55,7 +55,7 @@ class Fake < ERBLint::Linter
         linter.run(processed_source, [offense])
       end
 
-      it "reports the unused rule" do
+      it "reports the unused inline comment" do
         expect(subject.size).to(eq(1))
         expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake"))
       end
@@ -70,7 +70,7 @@ class Fake < ERBLint::Linter
         linter.run(processed_source, [offense])
       end
 
-      it "reports the unused rule" do
+      it "reports the unused inline comment" do
         expect(subject.size).to(eq(1))
         expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake2"))
       end
@@ -92,7 +92,7 @@ class Fake < ERBLint::Linter
         linter.run(processed_source, [offense])
       end
 
-      it "reports the unused rule" do
+      it "reports the unused inline comment" do
         expect(subject.size).to(eq(1))
         expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake"))
       end

From 2b47c0b4a6b05a7b55cc87803de229b7ba61f016 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Fri, 3 Mar 2023 10:34:29 -0500
Subject: [PATCH 64/85] * Run rubocop

---
 lib/erb_lint/linters/no_unused_disable.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/erb_lint/linters/no_unused_disable.rb b/lib/erb_lint/linters/no_unused_disable.rb
index 84c05d1b..629d077e 100644
--- a/lib/erb_lint/linters/no_unused_disable.rb
+++ b/lib/erb_lint/linters/no_unused_disable.rb
@@ -12,6 +12,7 @@ def run(processed_source, offenses)
         processed_source.source_buffer.source_lines.each_with_index do |line, index|
           rule_disable = disable_comment(line)
           next unless rule_disable
+
           rule_disable.split(",").each do |rule|
             disabled_rules_and_line_number[rule.strip] =
               (disabled_rules_and_line_number[rule.strip] ||= []).push(index + 1)
@@ -22,6 +23,7 @@ def run(processed_source, offenses)
           rule_name = offense.linter.class.simple_name
           line_numbers = disabled_rules_and_line_number[rule_name]
           next unless line_numbers
+
           line_numbers.reject do |line_number|
             if (offense.source_range.line_span.first..offense.source_range.line_span.last).include?(line_number)
               disabled_rules_and_line_number[rule_name].delete(line_number)

From 07a667bc4f915a646a6e9e4ab12423739cba4574 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 6 Mar 2023 22:04:29 -0500
Subject: [PATCH 65/85] Swap to erblint:disable-line

---
 lib/erb_lint/linter.rb                    |  8 +++-----
 lib/erb_lint/linters/no_unused_disable.rb | 10 ++++------
 lib/erb_lint/utils/inline_configs.rb      | 15 +++++++++++++++
 3 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 lib/erb_lint/utils/inline_configs.rb

diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
index 8676e470..4710fdaa 100644
--- a/lib/erb_lint/linter.rb
+++ b/lib/erb_lint/linter.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "erb_lint/utils/inline_disables"
+
 module ERBLint
   # Defines common functionality available to all linters.
   class Linter
@@ -75,7 +77,7 @@ def update_offense_status(processed_source)
         offense_line_range = offense.source_range.line_range
         offense_lines = source_for_line_range(processed_source, offense_line_range)
 
-        if rule_disable_comment?(offense_lines)
+        if Utils::InlineDisables.new.rule_disable_comment_for_lines?(self.class.simple_name, offense_lines)
           offense.disabled = true
         end
       end
@@ -84,9 +86,5 @@ def update_offense_status(processed_source)
     def source_for_line_range(processed_source, line_range)
       processed_source.source_buffer.source_lines[line_range.first - 1..line_range.last - 1].join
     end
-
-    def rule_disable_comment?(lines)
-      lines.match(/<%# erblint:disable (?<rules>.*#{self.class.simple_name}).*%>/)
-    end
   end
 end
diff --git a/lib/erb_lint/linters/no_unused_disable.rb b/lib/erb_lint/linters/no_unused_disable.rb
index 629d077e..eade0d65 100644
--- a/lib/erb_lint/linters/no_unused_disable.rb
+++ b/lib/erb_lint/linters/no_unused_disable.rb
@@ -34,16 +34,14 @@ def run(processed_source, offenses)
         disabled_rules_and_line_number.each do |rule, line_numbers|
           line_numbers.each do |line_number|
             add_offense(processed_source.source_buffer.line_range(line_number),
-              "Unused erblint:disable comment for #{rule}")
+              "Unused erblint:disable-line comment for #{rule}")
           end
         end
       end
 
-      private
-
-      def disable_comment(line)
-        line.match(/<%# erblint:disable (?<rules>.*) %>/)&.named_captures&.fetch("rules")
-      end
+      # def disable_comment(line)
+      #   line.match(/# erblint:disable-line (?<rules>.*) %>/)&.named_captures&.fetch("rules")
+      # end
     end
   end
 end
diff --git a/lib/erb_lint/utils/inline_configs.rb b/lib/erb_lint/utils/inline_configs.rb
new file mode 100644
index 00000000..519a61dc
--- /dev/null
+++ b/lib/erb_lint/utils/inline_configs.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ERBLint
+  module Utils
+    class InlineConfigs
+      def rule_disable_comment_for_lines?(rule, lines)
+        lines.match?(/# erblint:disable-line (?<rules>.*#{rule}).*/)
+      end
+
+      def disabled_rules(line)
+        line.match(/# erblint:disable-line (?<rules>.*) %>/)&.named_captures&.fetch("rules")
+      end
+    end
+  end
+end

From bfa90e22343d796be9358bbba0d64b288469b407 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 6 Mar 2023 22:04:36 -0500
Subject: [PATCH 66/85] Update specs

---
 .../linters/no_unused_disable_spec.rb         | 20 ++++-----
 spec/erb_lint/runner_spec.rb                  |  6 +--
 .../utils/rule_disable_comment_spec.rb        | 44 +++++++++++++++++++
 3 files changed, 57 insertions(+), 13 deletions(-)
 create mode 100644 spec/lib/erb_lint/utils/rule_disable_comment_spec.rb

diff --git a/spec/erb_lint/linters/no_unused_disable_spec.rb b/spec/erb_lint/linters/no_unused_disable_spec.rb
index b23550e1..280566b0 100644
--- a/spec/erb_lint/linters/no_unused_disable_spec.rb
+++ b/spec/erb_lint/linters/no_unused_disable_spec.rb
@@ -21,16 +21,16 @@ class Fake < ERBLint::Linter
   describe "offenses" do
     subject { offenses }
     context "when file has unused disable comment" do
-      let(:file) { "<span></span><%# erblint:disable Fake %>" }
+      let(:file) { "<span></span><%# erblint:disable-line Fake %>" }
       before { linter.run(processed_source, []) }
       it do
         expect(subject.size).to(eq(1))
-        expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake"))
+        expect(subject.first.message).to(eq("Unused erblint:disable-line comment for Fake"))
       end
     end
 
     context "when file has a disable comment and a corresponding offense" do
-      let(:file) { "<span></span><%# erblint:disable Fake %>" }
+      let(:file) { "<span></span><%# erblint:disable-line Fake %>" }
       before do
         offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
           processed_source.to_source_range(1..6), "some fake linter message")
@@ -45,7 +45,7 @@ class Fake < ERBLint::Linter
 
     context "when file has a disable comment in wrong place and a corresponding offense" do
       let(:file) { <<~FILE }
-        <%# erblint:disable Fake %>
+        <%# erblint:disable-line Fake %>
         <span>bad content</span>
       FILE
       before do
@@ -57,12 +57,12 @@ class Fake < ERBLint::Linter
 
       it "reports the unused inline comment" do
         expect(subject.size).to(eq(1))
-        expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake"))
+        expect(subject.first.message).to(eq("Unused erblint:disable-line comment for Fake"))
       end
     end
 
     context "when file has disable comment for multiple rules" do
-      let(:file) { "<span></span><%# erblint:disable Fake, Fake2 %>" }
+      let(:file) { "<span></span><%# erblint:disable-line Fake, Fake2 %>" }
       before do
         offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
           processed_source.to_source_range(1..6), "some fake linter message")
@@ -72,14 +72,14 @@ class Fake < ERBLint::Linter
 
       it "reports the unused inline comment" do
         expect(subject.size).to(eq(1))
-        expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake2"))
+        expect(subject.first.message).to(eq("Unused erblint:disable-line comment for Fake2"))
       end
     end
 
     context "when file has multiple disable comments for one offense" do
       let(:file) { <<~ERB }
-        <%# erblint:disable Fake %>
-        <span></span><%# erblint:disable Fake %>
+        <%# erblint:disable-line Fake %>
+        <span></span><%# erblint:disable-line Fake %>
       ERB
       before do
         second_line_range = processed_source.source_buffer.line_range(2).to_range
@@ -94,7 +94,7 @@ class Fake < ERBLint::Linter
 
       it "reports the unused inline comment" do
         expect(subject.size).to(eq(1))
-        expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake"))
+        expect(subject.first.message).to(eq("Unused erblint:disable-line comment for Fake"))
       end
     end
   end
diff --git a/spec/erb_lint/runner_spec.rb b/spec/erb_lint/runner_spec.rb
index a529d19d..8832e15a 100644
--- a/spec/erb_lint/runner_spec.rb
+++ b/spec/erb_lint/runner_spec.rb
@@ -171,7 +171,7 @@ class FakeLinter4 < FakeLinter3; end
       let(:file) { <<~FILE }
         <div>something</div>
         <span>bad content</span>
-        <%# erblint:disable FakeLinter3 %>
+        <%# erblint:disable-line FakeLinter3 %>
       FILE
       let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
 
@@ -187,7 +187,7 @@ class FakeLinter4 < FakeLinter3; end
       let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
       let(:file) { <<~FILE }
         <div>something</div>
-        <span>bad content</span><%# erblint:disable FakeLinter3 %>
+        <span>bad content</span><%# erblint:disable-line FakeLinter3 %>
       FILE
       let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
 
@@ -202,7 +202,7 @@ class FakeLinter4 < FakeLinter3; end
       let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
       let(:file) { <<~FILE }
         <div>something</div>
-        <span>bad content</span> <%# erblint:disable FakeLinter3, FakeLinter4 %>
+        <span>bad content</span> <%# erblint:disable-line FakeLinter3, FakeLinter4 %>
       FILE
       let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
 
diff --git a/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb b/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb
new file mode 100644
index 00000000..ecd0f74d
--- /dev/null
+++ b/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe ERBLint::Utils::InlineDisables do
+  let(:utils) { described_class.new }
+
+  context "rule_disable_comment_for_lines?" do
+    it "true when lines contain a erblint:disable-line comment for rule in ERB" do
+      offending_lines = '<a href="#"></a><%# erblint:disable-line AnchorRule %>'
+      expect(utils.rule_disable_comment_for_lines?("AnchorRule", offending_lines)).to(be(true))
+    end
+
+    it "true lines when lines contain a erblint:disable-line comment for rule in Ruby comment" do
+      offending_lines = '<%
+			button = {
+					role: "img" # erblint:disable-line IncorrectRoleRule
+			}
+			%>'
+      expect(utils.rule_disable_comment_for_lines?("IncorrectRoleRule", offending_lines)).to(be(true))
+    end
+
+    it "true lines when lines contain matching erblint:disable-line comment for rule in Ruby comment" do
+      offending_lines = '<%
+			button = {
+					role: "img" # erblint:disable-line IncorrectRoleRule, AnotherRule
+			}
+			%>'
+      expect(utils.rule_disable_comment_for_lines?("AnotherRule", offending_lines)).to(be(true))
+    end
+
+    it "false when lines contain erblint:disable-line comment that does not contain specified rule" do
+      offending_lines = '<a href="#"></a><%# erblint:disable-line AnchorRule %>'
+      expect(utils.rule_disable_comment_for_lines?("AnotherRule", offending_lines)).to(be(false))
+    end
+  end
+
+  context "disabled_rules" do
+    it "returns rule in ERB" do
+      lines = '<a href="#"></a><%# erblint:disable-line AnchorRule %>'
+      expect(utils.disabled_rule(lines)).to(eq(true))
+    end
+  end
+end

From fb4a97ba18e4a89994628b7d909f91dfb5b4f899 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 6 Mar 2023 22:04:45 -0500
Subject: [PATCH 67/85] update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4384621a..f4ae0e0c 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ You can disable a rule by placing a disable comment in the following format:
 
 Comment on offending lines
 ```.erb
-<hr /> <%# erblint:disable SelfClosingTag %>
+<hr /> <%# erblint:disable-line SelfClosingTag %>
 ```
 
 To raise an error when there is a useless disable comment, enable `NoUnusedDisable`.

From 0adc7551a8fd873ede31624a4a8be9066b5d84b5 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 6 Mar 2023 22:10:35 -0500
Subject: [PATCH 68/85] Rename everything to inline config

---
 README.md                                            | 2 +-
 lib/erb_lint/cli.rb                                  | 2 +-
 lib/erb_lint/linter.rb                               | 4 ++--
 lib/erb_lint/linters/no_unused_disable.rb            | 4 ----
 spec/lib/erb_lint/utils/rule_disable_comment_spec.rb | 9 +++++++--
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index f4ae0e0c..efbf5762 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ Comment on offending lines
 
 To raise an error when there is a useless disable comment, enable `NoUnusedDisable`.
 
-To disable inline comments and report all offenses, set `--no-inline-disable` option.
+To disable inline comments and report all offenses, set `--disable-inline-configs` option.
 
 ## Exclude
 
diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 2a112ee8..712c54e0 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -375,7 +375,7 @@ def option_parser
           @options[:allow_no_files] = config
         end
 
-        opts.on("--disable-inline-config", "Report all offenses while ignoring inline disable comments") do
+        opts.on("--disable-inline-configs", "Report all offenses while ignoring inline disable comments") do
           @options[:disable_inline_config] = true
         end
 
diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
index 4710fdaa..b0c3090f 100644
--- a/lib/erb_lint/linter.rb
+++ b/lib/erb_lint/linter.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "erb_lint/utils/inline_disables"
+require "erb_lint/utils/inline_configs"
 
 module ERBLint
   # Defines common functionality available to all linters.
@@ -77,7 +77,7 @@ def update_offense_status(processed_source)
         offense_line_range = offense.source_range.line_range
         offense_lines = source_for_line_range(processed_source, offense_line_range)
 
-        if Utils::InlineDisables.new.rule_disable_comment_for_lines?(self.class.simple_name, offense_lines)
+        if Utils::InlineConfigs.new.rule_disable_comment_for_lines?(self.class.simple_name, offense_lines)
           offense.disabled = true
         end
       end
diff --git a/lib/erb_lint/linters/no_unused_disable.rb b/lib/erb_lint/linters/no_unused_disable.rb
index eade0d65..9a724674 100644
--- a/lib/erb_lint/linters/no_unused_disable.rb
+++ b/lib/erb_lint/linters/no_unused_disable.rb
@@ -38,10 +38,6 @@ def run(processed_source, offenses)
           end
         end
       end
-
-      # def disable_comment(line)
-      #   line.match(/# erblint:disable-line (?<rules>.*) %>/)&.named_captures&.fetch("rules")
-      # end
     end
   end
 end
diff --git a/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb b/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb
index ecd0f74d..051e795b 100644
--- a/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb
+++ b/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe ERBLint::Utils::InlineDisables do
+describe ERBLint::Utils::InlineConfigs do
   let(:utils) { described_class.new }
 
   context "rule_disable_comment_for_lines?" do
@@ -38,7 +38,12 @@
   context "disabled_rules" do
     it "returns rule in ERB" do
       lines = '<a href="#"></a><%# erblint:disable-line AnchorRule %>'
-      expect(utils.disabled_rule(lines)).to(eq(true))
+      expect(utils.disabled_rules(lines)).to(eq('AnchorRule'))
+    end
+
+		it "returns rules in ERB" do
+      lines = '<a href="#"></a><%# erblint:disable-line Rule1, Rule2, Rule3 %>'
+      expect(utils.disabled_rules(lines)).to(eq('Rule1, Rule2, Rule3'))
     end
   end
 end

From 43c0856d34c41c4baf57d8e7f332aa794d34e27d Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 6 Mar 2023 22:21:45 -0500
Subject: [PATCH 69/85] Change methods to self.

---
 lib/erb_lint/linter.rb                    | 2 +-
 lib/erb_lint/linters/no_unused_disable.rb | 8 +++++---
 lib/erb_lint/utils/inline_configs.rb      | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
index b0c3090f..fa536087 100644
--- a/lib/erb_lint/linter.rb
+++ b/lib/erb_lint/linter.rb
@@ -77,7 +77,7 @@ def update_offense_status(processed_source)
         offense_line_range = offense.source_range.line_range
         offense_lines = source_for_line_range(processed_source, offense_line_range)
 
-        if Utils::InlineConfigs.new.rule_disable_comment_for_lines?(self.class.simple_name, offense_lines)
+        if Utils::InlineConfigs.rule_disable_comment_for_lines?(self.class.simple_name, offense_lines)
           offense.disabled = true
         end
       end
diff --git a/lib/erb_lint/linters/no_unused_disable.rb b/lib/erb_lint/linters/no_unused_disable.rb
index 9a724674..6456948d 100644
--- a/lib/erb_lint/linters/no_unused_disable.rb
+++ b/lib/erb_lint/linters/no_unused_disable.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "erb_lint/utils/inline_configs"
+
 module ERBLint
   module Linters
     # Checks for unused disable comments.
@@ -10,10 +12,10 @@ def run(processed_source, offenses)
         disabled_rules_and_line_number = {}
 
         processed_source.source_buffer.source_lines.each_with_index do |line, index|
-          rule_disable = disable_comment(line)
-          next unless rule_disable
+          rule_disables = Utils::InlineConfigs.disabled_rules(line)
+          next unless rule_disables
 
-          rule_disable.split(",").each do |rule|
+          rule_disables.split(",").each do |rule|
             disabled_rules_and_line_number[rule.strip] =
               (disabled_rules_and_line_number[rule.strip] ||= []).push(index + 1)
           end
diff --git a/lib/erb_lint/utils/inline_configs.rb b/lib/erb_lint/utils/inline_configs.rb
index 519a61dc..12adfced 100644
--- a/lib/erb_lint/utils/inline_configs.rb
+++ b/lib/erb_lint/utils/inline_configs.rb
@@ -3,11 +3,11 @@
 module ERBLint
   module Utils
     class InlineConfigs
-      def rule_disable_comment_for_lines?(rule, lines)
+      def self.rule_disable_comment_for_lines?(rule, lines)
         lines.match?(/# erblint:disable-line (?<rules>.*#{rule}).*/)
       end
 
-      def disabled_rules(line)
+      def self.disabled_rules(line)
         line.match(/# erblint:disable-line (?<rules>.*) %>/)&.named_captures&.fetch("rules")
       end
     end

From ab1ab6afca5641b6c424502e7db0311a0d6bb816 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 6 Mar 2023 22:23:37 -0500
Subject: [PATCH 70/85] Introduce new spec helper to more easily predict source
 range

---
 spec/erb_lint/linters/no_unused_disable_spec.rb      | 2 +-
 spec/lib/erb_lint/utils/rule_disable_comment_spec.rb | 2 +-
 spec/spec_helper.rb                                  | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/spec/erb_lint/linters/no_unused_disable_spec.rb b/spec/erb_lint/linters/no_unused_disable_spec.rb
index 280566b0..308e5c46 100644
--- a/spec/erb_lint/linters/no_unused_disable_spec.rb
+++ b/spec/erb_lint/linters/no_unused_disable_spec.rb
@@ -33,7 +33,7 @@ class Fake < ERBLint::Linter
       let(:file) { "<span></span><%# erblint:disable-line Fake %>" }
       before do
         offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
-          processed_source.to_source_range(1..6), "some fake linter message")
+          processed_source.to_source_range(source_range_for_code(file, "<span></span>")), "some fake linter message")
         offense.disabled = true
         linter.run(processed_source, [offense])
       end
diff --git a/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb b/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb
index 051e795b..6beecf70 100644
--- a/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb
+++ b/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb
@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe ERBLint::Utils::InlineConfigs do
-  let(:utils) { described_class.new }
+  let(:utils) { described_class }
 
   context "rule_disable_comment_for_lines?" do
     it "true when lines contain a erblint:disable-line comment for rule in ERB" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ca57c26d..4d59ca22 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,8 @@
 # frozen_string_literal: true
 
 require "erb_lint/all"
+
+def source_range_for_code(processed_source, code)
+  offending_source = processed_source.match(code)
+  processed_source.to_source_range(offending_source.begin(0)..offending_source.end(0))
+end

From 0b460a8acbae4029f690d8bdeea7032e0b49ee3a Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Mon, 6 Mar 2023 22:31:01 -0500
Subject: [PATCH 71/85] swap with new spec helper

---
 .../linters/no_unused_disable_spec.rb         | 20 ++++++++++++-------
 .../utils/rule_disable_comment_spec.rb        |  6 +++---
 spec/spec_helper.rb                           |  6 +++---
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/spec/erb_lint/linters/no_unused_disable_spec.rb b/spec/erb_lint/linters/no_unused_disable_spec.rb
index 308e5c46..60f9c145 100644
--- a/spec/erb_lint/linters/no_unused_disable_spec.rb
+++ b/spec/erb_lint/linters/no_unused_disable_spec.rb
@@ -33,7 +33,8 @@ class Fake < ERBLint::Linter
       let(:file) { "<span></span><%# erblint:disable-line Fake %>" }
       before do
         offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
-          processed_source.to_source_range(source_range_for_code(file, "<span></span>")), "some fake linter message")
+          source_range_for_code(file, processed_source, "<span></span>"),
+          "some fake linter message")
         offense.disabled = true
         linter.run(processed_source, [offense])
       end
@@ -49,8 +50,11 @@ class Fake < ERBLint::Linter
         <span>bad content</span>
       FILE
       before do
-        offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
-          processed_source.to_source_range(28..52), "some fake linter message")
+        offense = ERBLint::Offense.new(
+          ERBLint::Linters::Fake.new(file_loader, linter_config),
+          source_range_for_code(file, processed_source, "<span>bad content</span>"),
+          "some fake linter message"
+        )
         offense.disabled = true
         linter.run(processed_source, [offense])
       end
@@ -64,8 +68,11 @@ class Fake < ERBLint::Linter
     context "when file has disable comment for multiple rules" do
       let(:file) { "<span></span><%# erblint:disable-line Fake, Fake2 %>" }
       before do
-        offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
-          processed_source.to_source_range(1..6), "some fake linter message")
+        offense = ERBLint::Offense.new(
+          ERBLint::Linters::Fake.new(file_loader, linter_config),
+          source_range_for_code(file, processed_source, "<span></span>"),
+          "some fake linter message"
+        )
         offense.disabled = true
         linter.run(processed_source, [offense])
       end
@@ -82,10 +89,9 @@ class Fake < ERBLint::Linter
         <span></span><%# erblint:disable-line Fake %>
       ERB
       before do
-        second_line_range = processed_source.source_buffer.line_range(2).to_range
         offense = ERBLint::Offense.new(
           ERBLint::Linters::Fake.new(file_loader, linter_config),
-          processed_source.to_source_range(second_line_range),
+          source_range_for_code(file, processed_source, "<span></span>"),
           "some fake linter message"
         )
         offense.disabled = true
diff --git a/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb b/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb
index 6beecf70..e0b701a5 100644
--- a/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb
+++ b/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb
@@ -38,12 +38,12 @@
   context "disabled_rules" do
     it "returns rule in ERB" do
       lines = '<a href="#"></a><%# erblint:disable-line AnchorRule %>'
-      expect(utils.disabled_rules(lines)).to(eq('AnchorRule'))
+      expect(utils.disabled_rules(lines)).to(eq("AnchorRule"))
     end
 
-		it "returns rules in ERB" do
+    it "returns rules in ERB" do
       lines = '<a href="#"></a><%# erblint:disable-line Rule1, Rule2, Rule3 %>'
-      expect(utils.disabled_rules(lines)).to(eq('Rule1, Rule2, Rule3'))
+      expect(utils.disabled_rules(lines)).to(eq("Rule1, Rule2, Rule3"))
     end
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4d59ca22..48500d10 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,7 @@
 
 require "erb_lint/all"
 
-def source_range_for_code(processed_source, code)
-  offending_source = processed_source.match(code)
-  processed_source.to_source_range(offending_source.begin(0)..offending_source.end(0))
+def source_range_for_code(file, processed_source, code)
+  offending_source = file.match(code)
+  processed_source.to_source_range(offending_source.begin(0)...offending_source.end(0))
 end

From a9c799e1b99cf8aac12d0002e6effc750ba81525 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Tue, 7 Mar 2023 17:56:16 -0500
Subject: [PATCH 72/85] rename spec

---
 .../{rule_disable_comment_spec.rb => inline_configs_spec.rb}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename spec/lib/erb_lint/utils/{rule_disable_comment_spec.rb => inline_configs_spec.rb} (100%)

diff --git a/spec/lib/erb_lint/utils/rule_disable_comment_spec.rb b/spec/lib/erb_lint/utils/inline_configs_spec.rb
similarity index 100%
rename from spec/lib/erb_lint/utils/rule_disable_comment_spec.rb
rename to spec/lib/erb_lint/utils/inline_configs_spec.rb

From c46d46ef97c878bac3cab697a439116125d57d6c Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Tue, 7 Mar 2023 18:08:23 -0500
Subject: [PATCH 73/85] use plural name

---
 lib/erb_lint/cli.rb    |  6 +++---
 lib/erb_lint/linter.rb |  4 ++--
 lib/erb_lint/runner.rb | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/erb_lint/cli.rb b/lib/erb_lint/cli.rb
index 712c54e0..932a2276 100644
--- a/lib/erb_lint/cli.rb
+++ b/lib/erb_lint/cli.rb
@@ -69,7 +69,7 @@ def run(args = ARGV)
 
       @options[:format] ||= :multiline
       @options[:fail_level] ||= severity_level_for_name(:refactor)
-      @options[:disable_inline_config] ||= false
+      @options[:disable_inline_configs] ||= false
       @stats.files = lint_files.size
       @stats.linters = enabled_linter_classes.size
       @stats.autocorrectable_linters = enabled_linter_classes.count(&:support_autocorrect?)
@@ -77,7 +77,7 @@ def run(args = ARGV)
       reporter = Reporter.create_reporter(@options[:format], @stats, autocorrect?)
       reporter.preview
 
-      runner = ERBLint::Runner.new(file_loader, @config, @options[:disable_inline_config])
+      runner = ERBLint::Runner.new(file_loader, @config, @options[:disable_inline_configs])
       file_content = nil
 
       lint_files.each do |filename|
@@ -376,7 +376,7 @@ def option_parser
         end
 
         opts.on("--disable-inline-configs", "Report all offenses while ignoring inline disable comments") do
-          @options[:disable_inline_config] = true
+          @options[:disable_inline_configs] = true
         end
 
         opts.on(
diff --git a/lib/erb_lint/linter.rb b/lib/erb_lint/linter.rb
index fa536087..4eec7fd2 100644
--- a/lib/erb_lint/linter.rb
+++ b/lib/erb_lint/linter.rb
@@ -55,9 +55,9 @@ def run(_processed_source)
       raise NotImplementedError, "must implement ##{__method__}"
     end
 
-    def run_and_update_offense_status(processed_source, enable_inline_config = true)
+    def run_and_update_offense_status(processed_source, enable_inline_configs = true)
       run(processed_source)
-      if @offenses.any? && enable_inline_config
+      if @offenses.any? && enable_inline_configs
         update_offense_status(processed_source)
       end
     end
diff --git a/lib/erb_lint/runner.rb b/lib/erb_lint/runner.rb
index c1136d12..bdcdb346 100644
--- a/lib/erb_lint/runner.rb
+++ b/lib/erb_lint/runner.rb
@@ -5,7 +5,7 @@ module ERBLint
   class Runner
     attr_reader :offenses
 
-    def initialize(file_loader, config, disable_inline_config = false)
+    def initialize(file_loader, config, disable_inline_configs = false)
       @file_loader = file_loader
       @config = config || RunnerConfig.default
       raise ArgumentError, "expect `config` to be a RunnerConfig instance" unless @config.is_a?(RunnerConfig)
@@ -17,7 +17,7 @@ def initialize(file_loader, config, disable_inline_config = false)
         linter_class.new(@file_loader, @config.for_linter(linter_class))
       end
       @no_unused_disable = nil
-      @disable_inline_config = disable_inline_config
+      @disable_inline_configs = disable_inline_configs
       @offenses = []
     end
 
@@ -25,7 +25,7 @@ def run(processed_source)
       @linters
         .reject { |linter| linter.excludes_file?(processed_source.filename) }
         .each do |linter|
-        linter.run_and_update_offense_status(processed_source, enable_inline_config?)
+        linter.run_and_update_offense_status(processed_source, enable_inline_configs?)
         @offenses.concat(linter.offenses)
       end
       report_unused_disable(processed_source)
@@ -44,8 +44,8 @@ def restore_offenses(offenses)
 
     private
 
-    def enable_inline_config?
-      !@disable_inline_config
+    def enable_inline_configs?
+      !@disable_inline_configs
     end
 
     def no_unused_disable_enabled?
@@ -54,7 +54,7 @@ def no_unused_disable_enabled?
     end
 
     def report_unused_disable(processed_source)
-      if no_unused_disable_enabled? && enable_inline_config?
+      if no_unused_disable_enabled? && enable_inline_configs?
         @no_unused_disable = ERBLint::Linters::NoUnusedDisable.new(
           @file_loader,
           @config.for_linter(ERBLint::Linters::NoUnusedDisable)

From 6e644fd6347ace1d56b7671b25fd0a24348a2f3b Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Tue, 7 Mar 2023 18:33:22 -0500
Subject: [PATCH 74/85] update source_range_for_code helper and use it

---
 spec/erb_lint/linters/no_unused_disable_spec.rb | 8 ++++----
 spec/erb_lint/runner_spec.rb                    | 3 +--
 spec/spec_helper.rb                             | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/spec/erb_lint/linters/no_unused_disable_spec.rb b/spec/erb_lint/linters/no_unused_disable_spec.rb
index 60f9c145..cea6856e 100644
--- a/spec/erb_lint/linters/no_unused_disable_spec.rb
+++ b/spec/erb_lint/linters/no_unused_disable_spec.rb
@@ -33,7 +33,7 @@ class Fake < ERBLint::Linter
       let(:file) { "<span></span><%# erblint:disable-line Fake %>" }
       before do
         offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
-          source_range_for_code(file, processed_source, "<span></span>"),
+          source_range_for_code(processed_source, "<span></span>"),
           "some fake linter message")
         offense.disabled = true
         linter.run(processed_source, [offense])
@@ -52,7 +52,7 @@ class Fake < ERBLint::Linter
       before do
         offense = ERBLint::Offense.new(
           ERBLint::Linters::Fake.new(file_loader, linter_config),
-          source_range_for_code(file, processed_source, "<span>bad content</span>"),
+          source_range_for_code(processed_source, "<span>bad content</span>"),
           "some fake linter message"
         )
         offense.disabled = true
@@ -70,7 +70,7 @@ class Fake < ERBLint::Linter
       before do
         offense = ERBLint::Offense.new(
           ERBLint::Linters::Fake.new(file_loader, linter_config),
-          source_range_for_code(file, processed_source, "<span></span>"),
+          source_range_for_code(processed_source, "<span></span>"),
           "some fake linter message"
         )
         offense.disabled = true
@@ -91,7 +91,7 @@ class Fake < ERBLint::Linter
       before do
         offense = ERBLint::Offense.new(
           ERBLint::Linters::Fake.new(file_loader, linter_config),
-          source_range_for_code(file, processed_source, "<span></span>"),
+          source_range_for_code(processed_source, "<span></span>"),
           "some fake linter message"
         )
         offense.disabled = true
diff --git a/spec/erb_lint/runner_spec.rb b/spec/erb_lint/runner_spec.rb
index 8832e15a..24943e8a 100644
--- a/spec/erb_lint/runner_spec.rb
+++ b/spec/erb_lint/runner_spec.rb
@@ -138,8 +138,7 @@ module ERBLint
       module Linters
         class FakeLinter3 < Linter
           def run(processed_source)
-            second_line_range = processed_source.source_buffer.line_range(2).to_range # reports second line of file
-            add_offense(processed_source.to_source_range(second_line_range), "#{self.class.name} error")
+            add_offense(source_range_for_code(processed_source, "<span>bad content</span>"), "#{self.class.name} error")
           end
         end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 48500d10..aa48e0ff 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,7 @@
 
 require "erb_lint/all"
 
-def source_range_for_code(file, processed_source, code)
-  offending_source = file.match(code)
+def source_range_for_code(processed_source, code)
+  offending_source = processed_source.file_content.match(code)
   processed_source.to_source_range(offending_source.begin(0)...offending_source.end(0))
 end

From 9f95018fe7db18d7406369f7b171ce81f12db3ad Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Tue, 7 Mar 2023 18:42:04 -0500
Subject: [PATCH 75/85] add test for disable-inline-configs

---
 spec/erb_lint/cli_spec.rb | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/spec/erb_lint/cli_spec.rb b/spec/erb_lint/cli_spec.rb
index 50da7582..c27ae1f1 100644
--- a/spec/erb_lint/cli_spec.rb
+++ b/spec/erb_lint/cli_spec.rb
@@ -98,6 +98,33 @@ def run(processed_source)
       end
     end
 
+    context "with --disable-inline-configs" do
+      module ERBLint
+        module Linters
+          class FakeLinter < Linter
+            def run(processed_source)
+              add_offense(source_range_for_code(processed_source, "<violation></violation>"),
+                "#{self.class.name} error")
+            end
+          end
+        end
+      end
+      let(:linted_file) { "app/views/template.html.erb" }
+      let(:args) { ["--disable-inline-configs", "--enable-linter", "fake_linter", linted_file] }
+      let(:file_content) { "<violation></violation> <%# erblint:disable-line FakeLinter %>" }
+
+      before do
+        allow(ERBLint::LinterRegistry).to(receive(:linters)
+          .and_return([ERBLint::Linters::FakeLinter]))
+        FileUtils.mkdir_p(File.dirname(linted_file))
+        File.write(linted_file, file_content)
+      end
+
+      it "shows all errors regardless of inline disables " do
+        expect { subject }.to(output(/ERBLint::Linters::FakeLinter error/).to_stdout)
+      end
+    end
+
     context "with --clear-cache" do
       let(:args) { ["--clear-cache"] }
       context "without a cache folder" do

From d2f0e1aab7fa7d567fd1d4775df66d739bbea5d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Mar 2023 00:54:30 +0000
Subject: [PATCH 76/85] Bump activesupport from 7.0.4.1 to 7.0.4.3

Bumps [activesupport](https://github.com/rails/rails) from 7.0.4.1 to 7.0.4.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Changelog](https://github.com/rails/rails/blob/v7.0.4.3/activesupport/CHANGELOG.md)
- [Commits](https://github.com/rails/rails/compare/v7.0.4.1...v7.0.4.3)

---
updated-dependencies:
- dependency-name: activesupport
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 96a01a26..412e43e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,13 +12,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (7.0.4.1)
-      activesupport (= 7.0.4.1)
+    actionview (7.0.4.3)
+      activesupport (= 7.0.4.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.4.1)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -32,7 +32,7 @@ GEM
       parser (>= 2.4)
       smart_properties
     builder (3.2.4)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
     diff-lcs (1.5.0)
     erubi (1.11.0)
@@ -43,7 +43,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mini_portile2 (2.8.0)
-    minitest (5.17.0)
+    minitest (5.18.0)
     nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
@@ -88,7 +88,7 @@ GEM
       rubocop (~> 1.30)
     ruby-progressbar (1.11.0)
     smart_properties (1.17.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
 

From f52fc0fd734236c9836b6d40ae551f9df12af628 Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Fri, 17 Mar 2023 16:00:54 -0400
Subject: [PATCH 77/85] Move test helper to module

---
 spec/erb_lint/cli_spec.rb                       | 3 ++-
 spec/erb_lint/linters/no_unused_disable_spec.rb | 9 +++++----
 spec/erb_lint/runner_spec.rb                    | 4 +++-
 spec/spec_helper.rb                             | 5 -----
 spec/spec_utils.rb                              | 8 ++++++++
 5 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 spec/spec_utils.rb

diff --git a/spec/erb_lint/cli_spec.rb b/spec/erb_lint/cli_spec.rb
index c27ae1f1..a40ecf2d 100644
--- a/spec/erb_lint/cli_spec.rb
+++ b/spec/erb_lint/cli_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require "spec_utils"
 require "erb_lint/cli"
 require "erb_lint/cache"
 require "pp"
@@ -103,7 +104,7 @@ module ERBLint
         module Linters
           class FakeLinter < Linter
             def run(processed_source)
-              add_offense(source_range_for_code(processed_source, "<violation></violation>"),
+              add_offense(SpecUtils.source_range_for_code(processed_source, "<violation></violation>"),
                 "#{self.class.name} error")
             end
           end
diff --git a/spec/erb_lint/linters/no_unused_disable_spec.rb b/spec/erb_lint/linters/no_unused_disable_spec.rb
index cea6856e..40aa753f 100644
--- a/spec/erb_lint/linters/no_unused_disable_spec.rb
+++ b/spec/erb_lint/linters/no_unused_disable_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require "spec_utils"
 
 describe ERBLint::Linters::NoUnusedDisable do
   let(:linter_config) { described_class.config_schema.new }
@@ -33,7 +34,7 @@ class Fake < ERBLint::Linter
       let(:file) { "<span></span><%# erblint:disable-line Fake %>" }
       before do
         offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
-          source_range_for_code(processed_source, "<span></span>"),
+          SpecUtils.source_range_for_code(processed_source, "<span></span>"),
           "some fake linter message")
         offense.disabled = true
         linter.run(processed_source, [offense])
@@ -52,7 +53,7 @@ class Fake < ERBLint::Linter
       before do
         offense = ERBLint::Offense.new(
           ERBLint::Linters::Fake.new(file_loader, linter_config),
-          source_range_for_code(processed_source, "<span>bad content</span>"),
+          SpecUtils.source_range_for_code(processed_source, "<span>bad content</span>"),
           "some fake linter message"
         )
         offense.disabled = true
@@ -70,7 +71,7 @@ class Fake < ERBLint::Linter
       before do
         offense = ERBLint::Offense.new(
           ERBLint::Linters::Fake.new(file_loader, linter_config),
-          source_range_for_code(processed_source, "<span></span>"),
+          SpecUtils.source_range_for_code(processed_source, "<span></span>"),
           "some fake linter message"
         )
         offense.disabled = true
@@ -91,7 +92,7 @@ class Fake < ERBLint::Linter
       before do
         offense = ERBLint::Offense.new(
           ERBLint::Linters::Fake.new(file_loader, linter_config),
-          source_range_for_code(processed_source, "<span></span>"),
+          SpecUtils.source_range_for_code(processed_source, "<span></span>"),
           "some fake linter message"
         )
         offense.disabled = true
diff --git a/spec/erb_lint/runner_spec.rb b/spec/erb_lint/runner_spec.rb
index 24943e8a..2869fdc2 100644
--- a/spec/erb_lint/runner_spec.rb
+++ b/spec/erb_lint/runner_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require "spec_utils"
 
 describe ERBLint::Runner do
   let(:file_loader) { ERBLint::FileLoader.new("/root/directory") }
@@ -138,7 +139,8 @@ module ERBLint
       module Linters
         class FakeLinter3 < Linter
           def run(processed_source)
-            add_offense(source_range_for_code(processed_source, "<span>bad content</span>"), "#{self.class.name} error")
+            add_offense(SpecUtils.source_range_for_code(processed_source, "<span>bad content</span>"),
+              "#{self.class.name} error")
           end
         end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index aa48e0ff..ca57c26d 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,8 +1,3 @@
 # frozen_string_literal: true
 
 require "erb_lint/all"
-
-def source_range_for_code(processed_source, code)
-  offending_source = processed_source.file_content.match(code)
-  processed_source.to_source_range(offending_source.begin(0)...offending_source.end(0))
-end
diff --git a/spec/spec_utils.rb b/spec/spec_utils.rb
new file mode 100644
index 00000000..c02435d5
--- /dev/null
+++ b/spec/spec_utils.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module SpecUtils
+  def self.source_range_for_code(processed_source, code)
+    offending_source = processed_source.file_content.match(code)
+    processed_source.to_source_range(offending_source.begin(0)...offending_source.end(0))
+  end
+end

From 0afcd51e3be68b164830db3df00ba480eb6d0abd Mon Sep 17 00:00:00 2001
From: Kate Higa <16447748+khiga8@users.noreply.github.com>
Date: Fri, 24 Mar 2023 15:48:51 -0400
Subject: [PATCH 78/85] Use erblint:disable not erblint:disable-line to align
 with Rubocop

---
 README.md                                     |  2 +-
 lib/erb_lint/linters/no_unused_disable.rb     |  2 +-
 lib/erb_lint/utils/inline_configs.rb          |  4 ++--
 spec/erb_lint/cli_spec.rb                     |  2 +-
 .../linters/no_unused_disable_spec.rb         | 20 +++++++++----------
 spec/erb_lint/runner_spec.rb                  |  6 +++---
 .../lib/erb_lint/utils/inline_configs_spec.rb | 20 +++++++++----------
 7 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index efbf5762..06f3beef 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ You can disable a rule by placing a disable comment in the following format:
 
 Comment on offending lines
 ```.erb
-<hr /> <%# erblint:disable-line SelfClosingTag %>
+<hr /> <%# erblint:disable SelfClosingTag %>
 ```
 
 To raise an error when there is a useless disable comment, enable `NoUnusedDisable`.
diff --git a/lib/erb_lint/linters/no_unused_disable.rb b/lib/erb_lint/linters/no_unused_disable.rb
index 6456948d..91f37317 100644
--- a/lib/erb_lint/linters/no_unused_disable.rb
+++ b/lib/erb_lint/linters/no_unused_disable.rb
@@ -36,7 +36,7 @@ def run(processed_source, offenses)
         disabled_rules_and_line_number.each do |rule, line_numbers|
           line_numbers.each do |line_number|
             add_offense(processed_source.source_buffer.line_range(line_number),
-              "Unused erblint:disable-line comment for #{rule}")
+              "Unused erblint:disable comment for #{rule}")
           end
         end
       end
diff --git a/lib/erb_lint/utils/inline_configs.rb b/lib/erb_lint/utils/inline_configs.rb
index 12adfced..c90eb54a 100644
--- a/lib/erb_lint/utils/inline_configs.rb
+++ b/lib/erb_lint/utils/inline_configs.rb
@@ -4,11 +4,11 @@ module ERBLint
   module Utils
     class InlineConfigs
       def self.rule_disable_comment_for_lines?(rule, lines)
-        lines.match?(/# erblint:disable-line (?<rules>.*#{rule}).*/)
+        lines.match?(/# erblint:disable (?<rules>.*#{rule}).*/)
       end
 
       def self.disabled_rules(line)
-        line.match(/# erblint:disable-line (?<rules>.*) %>/)&.named_captures&.fetch("rules")
+        line.match(/# erblint:disable (?<rules>.*) %>/)&.named_captures&.fetch("rules")
       end
     end
   end
diff --git a/spec/erb_lint/cli_spec.rb b/spec/erb_lint/cli_spec.rb
index a40ecf2d..bec01619 100644
--- a/spec/erb_lint/cli_spec.rb
+++ b/spec/erb_lint/cli_spec.rb
@@ -112,7 +112,7 @@ def run(processed_source)
       end
       let(:linted_file) { "app/views/template.html.erb" }
       let(:args) { ["--disable-inline-configs", "--enable-linter", "fake_linter", linted_file] }
-      let(:file_content) { "<violation></violation> <%# erblint:disable-line FakeLinter %>" }
+      let(:file_content) { "<violation></violation> <%# erblint:disable FakeLinter %>" }
 
       before do
         allow(ERBLint::LinterRegistry).to(receive(:linters)
diff --git a/spec/erb_lint/linters/no_unused_disable_spec.rb b/spec/erb_lint/linters/no_unused_disable_spec.rb
index 40aa753f..52c7c68b 100644
--- a/spec/erb_lint/linters/no_unused_disable_spec.rb
+++ b/spec/erb_lint/linters/no_unused_disable_spec.rb
@@ -22,16 +22,16 @@ class Fake < ERBLint::Linter
   describe "offenses" do
     subject { offenses }
     context "when file has unused disable comment" do
-      let(:file) { "<span></span><%# erblint:disable-line Fake %>" }
+      let(:file) { "<span></span><%# erblint:disable Fake %>" }
       before { linter.run(processed_source, []) }
       it do
         expect(subject.size).to(eq(1))
-        expect(subject.first.message).to(eq("Unused erblint:disable-line comment for Fake"))
+        expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake"))
       end
     end
 
     context "when file has a disable comment and a corresponding offense" do
-      let(:file) { "<span></span><%# erblint:disable-line Fake %>" }
+      let(:file) { "<span></span><%# erblint:disable Fake %>" }
       before do
         offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
           SpecUtils.source_range_for_code(processed_source, "<span></span>"),
@@ -47,7 +47,7 @@ class Fake < ERBLint::Linter
 
     context "when file has a disable comment in wrong place and a corresponding offense" do
       let(:file) { <<~FILE }
-        <%# erblint:disable-line Fake %>
+        <%# erblint:disable Fake %>
         <span>bad content</span>
       FILE
       before do
@@ -62,12 +62,12 @@ class Fake < ERBLint::Linter
 
       it "reports the unused inline comment" do
         expect(subject.size).to(eq(1))
-        expect(subject.first.message).to(eq("Unused erblint:disable-line comment for Fake"))
+        expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake"))
       end
     end
 
     context "when file has disable comment for multiple rules" do
-      let(:file) { "<span></span><%# erblint:disable-line Fake, Fake2 %>" }
+      let(:file) { "<span></span><%# erblint:disable Fake, Fake2 %>" }
       before do
         offense = ERBLint::Offense.new(
           ERBLint::Linters::Fake.new(file_loader, linter_config),
@@ -80,14 +80,14 @@ class Fake < ERBLint::Linter
 
       it "reports the unused inline comment" do
         expect(subject.size).to(eq(1))
-        expect(subject.first.message).to(eq("Unused erblint:disable-line comment for Fake2"))
+        expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake2"))
       end
     end
 
     context "when file has multiple disable comments for one offense" do
       let(:file) { <<~ERB }
-        <%# erblint:disable-line Fake %>
-        <span></span><%# erblint:disable-line Fake %>
+        <%# erblint:disable Fake %>
+        <span></span><%# erblint:disable Fake %>
       ERB
       before do
         offense = ERBLint::Offense.new(
@@ -101,7 +101,7 @@ class Fake < ERBLint::Linter
 
       it "reports the unused inline comment" do
         expect(subject.size).to(eq(1))
-        expect(subject.first.message).to(eq("Unused erblint:disable-line comment for Fake"))
+        expect(subject.first.message).to(eq("Unused erblint:disable comment for Fake"))
       end
     end
   end
diff --git a/spec/erb_lint/runner_spec.rb b/spec/erb_lint/runner_spec.rb
index 2869fdc2..a1531331 100644
--- a/spec/erb_lint/runner_spec.rb
+++ b/spec/erb_lint/runner_spec.rb
@@ -172,7 +172,7 @@ class FakeLinter4 < FakeLinter3; end
       let(:file) { <<~FILE }
         <div>something</div>
         <span>bad content</span>
-        <%# erblint:disable-line FakeLinter3 %>
+        <%# erblint:disable FakeLinter3 %>
       FILE
       let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
 
@@ -188,7 +188,7 @@ class FakeLinter4 < FakeLinter3; end
       let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
       let(:file) { <<~FILE }
         <div>something</div>
-        <span>bad content</span><%# erblint:disable-line FakeLinter3 %>
+        <span>bad content</span><%# erblint:disable FakeLinter3 %>
       FILE
       let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
 
@@ -203,7 +203,7 @@ class FakeLinter4 < FakeLinter3; end
       let(:filename) { "somefolder/otherfolder/dummyfile.html.erb" }
       let(:file) { <<~FILE }
         <div>something</div>
-        <span>bad content</span> <%# erblint:disable-line FakeLinter3, FakeLinter4 %>
+        <span>bad content</span> <%# erblint:disable FakeLinter3, FakeLinter4 %>
       FILE
       let(:processed_source) { ERBLint::ProcessedSource.new(filename, file) }
 
diff --git a/spec/lib/erb_lint/utils/inline_configs_spec.rb b/spec/lib/erb_lint/utils/inline_configs_spec.rb
index e0b701a5..d13adb65 100644
--- a/spec/lib/erb_lint/utils/inline_configs_spec.rb
+++ b/spec/lib/erb_lint/utils/inline_configs_spec.rb
@@ -6,43 +6,43 @@
   let(:utils) { described_class }
 
   context "rule_disable_comment_for_lines?" do
-    it "true when lines contain a erblint:disable-line comment for rule in ERB" do
-      offending_lines = '<a href="#"></a><%# erblint:disable-line AnchorRule %>'
+    it "true when lines contain a erblint:disable comment for rule in ERB" do
+      offending_lines = '<a href="#"></a><%# erblint:disable AnchorRule %>'
       expect(utils.rule_disable_comment_for_lines?("AnchorRule", offending_lines)).to(be(true))
     end
 
-    it "true lines when lines contain a erblint:disable-line comment for rule in Ruby comment" do
+    it "true lines when lines contain a erblint:disable comment for rule in Ruby comment" do
       offending_lines = '<%
 			button = {
-					role: "img" # erblint:disable-line IncorrectRoleRule
+					role: "img" # erblint:disable IncorrectRoleRule
 			}
 			%>'
       expect(utils.rule_disable_comment_for_lines?("IncorrectRoleRule", offending_lines)).to(be(true))
     end
 
-    it "true lines when lines contain matching erblint:disable-line comment for rule in Ruby comment" do
+    it "true lines when lines contain matching erblint:disable comment for rule in Ruby comment" do
       offending_lines = '<%
 			button = {
-					role: "img" # erblint:disable-line IncorrectRoleRule, AnotherRule
+					role: "img" # erblint:disable IncorrectRoleRule, AnotherRule
 			}
 			%>'
       expect(utils.rule_disable_comment_for_lines?("AnotherRule", offending_lines)).to(be(true))
     end
 
-    it "false when lines contain erblint:disable-line comment that does not contain specified rule" do
-      offending_lines = '<a href="#"></a><%# erblint:disable-line AnchorRule %>'
+    it "false when lines contain erblint:disable comment that does not contain specified rule" do
+      offending_lines = '<a href="#"></a><%# erblint:disable AnchorRule %>'
       expect(utils.rule_disable_comment_for_lines?("AnotherRule", offending_lines)).to(be(false))
     end
   end
 
   context "disabled_rules" do
     it "returns rule in ERB" do
-      lines = '<a href="#"></a><%# erblint:disable-line AnchorRule %>'
+      lines = '<a href="#"></a><%# erblint:disable AnchorRule %>'
       expect(utils.disabled_rules(lines)).to(eq("AnchorRule"))
     end
 
     it "returns rules in ERB" do
-      lines = '<a href="#"></a><%# erblint:disable-line Rule1, Rule2, Rule3 %>'
+      lines = '<a href="#"></a><%# erblint:disable Rule1, Rule2, Rule3 %>'
       expect(utils.disabled_rules(lines)).to(eq("Rule1, Rule2, Rule3"))
     end
   end

From 4545071ca01ae2c061213e5f42f931380e4a8bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafael.franca@shopify.com>
Date: Mon, 27 Mar 2023 21:28:02 +0000
Subject: [PATCH 79/85] Prepare for 0.4.0

---
 Gemfile.lock            | 12 ++++++------
 erb_lint.gemspec        |  4 ++--
 lib/erb_lint/version.rb |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 412e43e6..644a138f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    erb_lint (0.3.1)
+    erb_lint (0.4.0)
       activesupport
       better_html (>= 2.0.1)
       parser (>= 2.7.1.4)
@@ -35,26 +35,26 @@ GEM
     concurrent-ruby (1.2.2)
     crass (1.0.6)
     diff-lcs (1.5.0)
-    erubi (1.11.0)
+    erubi (1.12.0)
     fakefs (1.5.1)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.1)
     minitest (5.18.0)
-    nokogiri (1.13.10)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
-    racc (1.6.1)
+    racc (1.6.2)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.4)
+    rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
     rainbow (3.1.1)
     rake (13.0.6)
diff --git a/erb_lint.gemspec b/erb_lint.gemspec
index be77e1ff..33bab62a 100644
--- a/erb_lint.gemspec
+++ b/erb_lint.gemspec
@@ -7,8 +7,8 @@ require "erb_lint/version"
 Gem::Specification.new do |s|
   s.name = "erb_lint"
   s.version = ERBLint::VERSION
-  s.authors = ["Justin Chan"]
-  s.email = ["justin.the.c@gmail.com"]
+  s.authors = ["Justin Chan", "Shopify Developers"]
+  s.email = ["ruby@shopify.com"]
   s.summary = "ERB lint tool"
   s.description = "ERB Linter tool."
   s.homepage = "https://github.com/Shopify/erb-lint"
diff --git a/lib/erb_lint/version.rb b/lib/erb_lint/version.rb
index 3507433e..81d1dbb5 100644
--- a/lib/erb_lint/version.rb
+++ b/lib/erb_lint/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ERBLint
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

From 16c4adf814cea95384ca12421f29b454819838ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Apr 2023 08:36:56 +0000
Subject: [PATCH 80/85] Bump nokogiri from 1.14.2 to 1.14.3 (#316)

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 644a138f..8a32eb11 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,7 +44,7 @@ GEM
       nokogiri (>= 1.5.9)
     mini_portile2 (2.8.1)
     minitest (5.18.0)
-    nokogiri (1.14.2)
+    nokogiri (1.14.3)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     parallel (1.22.1)

From b66acc390a4c89db521a0fc619f2f1f92af367f3 Mon Sep 17 00:00:00 2001
From: mikoto2000 <mikoto2000@gmail.com>
Date: Thu, 25 May 2023 04:54:04 +0900
Subject: [PATCH 81/85] Add JUnit formatter

---
 lib/erb_lint/reporters/junit_reporter.rb | 110 +++++++++++++++++++++++
 spec/erb_lint/cli_spec.rb                |   5 +-
 2 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 lib/erb_lint/reporters/junit_reporter.rb

diff --git a/lib/erb_lint/reporters/junit_reporter.rb b/lib/erb_lint/reporters/junit_reporter.rb
new file mode 100644
index 00000000..ca051f86
--- /dev/null
+++ b/lib/erb_lint/reporters/junit_reporter.rb
@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+require "rexml/document"
+require "rexml/formatters/pretty"
+
+module ERBLint
+  module Reporters
+    class JunitReporter < Reporter
+      def preview; end
+
+      def show
+        xml = create_junit_xml
+        formatted_xml_string = StringIO.new
+        REXML::Formatters::Pretty.new.write(xml, formatted_xml_string)
+        puts formatted_xml_string.string
+      end
+
+      private
+
+      CONTEXT = {
+        prologue_quote: :quote,
+        attribute_quote: :quote,
+      }
+
+      def create_junit_xml
+        # create prologue
+        xml = REXML::Document.new(nil, CONTEXT)
+        xml << REXML::XMLDecl.new("1.0", "UTF-8")
+
+        xml.add_element(create_testsuite_element)
+
+        xml
+      end
+
+      def create_testsuite_element
+        tests = stats.processed_files.size
+        failures = stats.found
+        testsuite_element = REXML::Element.new("testsuite", nil, CONTEXT)
+        testsuite_element.add_attribute("name", "erblint")
+        testsuite_element.add_attribute("tests", tests.to_s)
+        testsuite_element.add_attribute("failures", failures.to_s)
+
+        testsuite_element.add_element(create_properties)
+
+        processed_files.each do |filename, offenses|
+          if offenses.empty?
+            testcase_element = REXML::Element.new("testcase", nil, CONTEXT)
+            testcase_element.add_attribute("name", filename.to_s)
+            testcase_element.add_attribute("file", filename.to_s)
+          end
+
+          offenses.each do |offense|
+            testsuite_element.add_element(create_testcase(filename, offense))
+          end
+        end
+
+        testsuite_element
+      end
+
+      def create_properties
+        properties_element = REXML::Element.new("properties", nil, CONTEXT)
+
+        [
+          ["erb_lint_version", ERBLint::VERSION],
+          ["ruby_engine", RUBY_ENGINE],
+          ["ruby_version", RUBY_VERSION],
+          ["ruby_patchlevel", RUBY_PATCHLEVEL.to_s],
+          ["ruby_platform", RUBY_PLATFORM],
+        ].each do |property_attribute|
+          properties_element.add_element(create_property(*property_attribute))
+        end
+
+        properties_element
+      end
+
+      def create_property(name, value)
+        property_element = REXML::Element.new("property")
+        property_element.add_attribute("name", name)
+        property_element.add_attribute("value", value)
+
+        property_element
+      end
+
+      def create_testcase(filename, offense)
+        testcase_element = REXML::Element.new("testcase", nil, CONTEXT)
+        testcase_element.add_attribute("name", filename.to_s)
+        testcase_element.add_attribute("file", filename.to_s)
+        testcase_element.add_attribute("lineno", offense.line_number.to_s)
+
+        testcase_element.add_element(create_failure(filename, offense))
+
+        testcase_element
+      end
+
+      def create_failure(filename, offense)
+        message = offense.message
+        type = offense.simple_name
+
+        failure_element = REXML::Element.new("failure", nil, CONTEXT)
+        failure_element.add_attribute("message", "#{type}: #{message}")
+        failure_element.add_attribute("type", type.to_s)
+
+        cdata_element = REXML::CData.new("#{filename}:#{offense.line_number}:#{offense.column}")
+        failure_element.add_text(cdata_element)
+
+        failure_element
+      end
+    end
+  end
+end
diff --git a/spec/erb_lint/cli_spec.rb b/spec/erb_lint/cli_spec.rb
index bec01619..4a3726cc 100644
--- a/spec/erb_lint/cli_spec.rb
+++ b/spec/erb_lint/cli_spec.rb
@@ -90,7 +90,9 @@ def run(processed_source)
 
       it "shows format instructions" do
         expect { subject }.to(
-          output(/Report offenses in the given format: \(compact, json, multiline\) \(default: multiline\)/).to_stdout
+          output(Regexp.new("Report offenses in the given format: " \
+            "\\(compact, json, junit, multiline\\) " \
+            "\\(default: multiline\\)")).to_stdout
         )
       end
 
@@ -503,6 +505,7 @@ def run(processed_source)
                 nonexistentformat: is not a valid format. Available formats:
                   - compact
                   - json
+                  - junit
                   - multiline
               EOF
             end

From d56a15deb43b99d46ae991765bc2a02034d44f59 Mon Sep 17 00:00:00 2001
From: mikoto2000 <mikoto2000@gmail.com>
Date: Fri, 26 May 2023 09:16:05 +0900
Subject: [PATCH 82/85] Add JUnit reporter spec and fix bugs

---
 lib/erb_lint/reporters/junit_reporter.rb      |  2 +
 spec/erb_lint/fixtures/junit.xml              | 21 +++++++
 .../erb_lint/reporters/junit_reporter_spec.rb | 61 +++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 spec/erb_lint/fixtures/junit.xml
 create mode 100644 spec/erb_lint/reporters/junit_reporter_spec.rb

diff --git a/lib/erb_lint/reporters/junit_reporter.rb b/lib/erb_lint/reporters/junit_reporter.rb
index ca051f86..7ae1897f 100644
--- a/lib/erb_lint/reporters/junit_reporter.rb
+++ b/lib/erb_lint/reporters/junit_reporter.rb
@@ -47,6 +47,8 @@ def create_testsuite_element
             testcase_element = REXML::Element.new("testcase", nil, CONTEXT)
             testcase_element.add_attribute("name", filename.to_s)
             testcase_element.add_attribute("file", filename.to_s)
+
+            testsuite_element.add_element(testcase_element)
           end
 
           offenses.each do |offense|
diff --git a/spec/erb_lint/fixtures/junit.xml b/spec/erb_lint/fixtures/junit.xml
new file mode 100644
index 00000000..dcacebf9
--- /dev/null
+++ b/spec/erb_lint/fixtures/junit.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="erblint" tests="2" failures="2">
+  <properties>
+    <property name="erb_lint_version" value="%{erb_lint_version}"/>
+    <property name="ruby_engine" value="%{ruby_engine}"/>
+    <property name="ruby_version" value="%{ruby_version}"/>
+    <property name="ruby_patchlevel" value="%{ruby_patchlevel}"/>
+    <property name="ruby_platform" value="%{ruby_platform}"/>
+  </properties>
+  <testcase name="app/views/subscriptions/_loader.html.erb" file="app/views/subscriptions/_loader.html.erb" lineno="1">
+    <failure message="SpaceInHtmlTag: Extra space detected where there should be no space." type="SpaceInHtmlTag">
+      <![CDATA[app/views/subscriptions/_loader.html.erb:1:7]]>
+    </failure>
+  </testcase>
+  <testcase name="app/views/subscriptions/_loader.html.erb" file="app/views/subscriptions/_loader.html.erb" lineno="52">
+    <failure message="ClosingErbTagIndent: Remove newline before `%%&gt;` to match start of tag." type="ClosingErbTagIndent">
+      <![CDATA[app/views/subscriptions/_loader.html.erb:52:10]]>
+    </failure>
+  </testcase>
+  <testcase name="app/views/application/index.html.erb" file="app/views/application/index.html.erb"/>
+</testsuite>
diff --git a/spec/erb_lint/reporters/junit_reporter_spec.rb b/spec/erb_lint/reporters/junit_reporter_spec.rb
new file mode 100644
index 00000000..f3635f09
--- /dev/null
+++ b/spec/erb_lint/reporters/junit_reporter_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe ERBLint::Reporters::JunitReporter do
+  describe ".show" do
+    subject { described_class.new(stats, false).show }
+
+    let(:stats) do
+      ERBLint::Stats.new(
+        found: 2,
+        processed_files: {
+          "app/views/subscriptions/_loader.html.erb" => offenses,
+          "app/views/application/index.html.erb" => [],
+        },
+        corrected: 1
+      )
+    end
+
+    let(:offenses) do
+      [
+        instance_double(
+          ERBLint::Offense,
+          message: "Extra space detected where there should be no space.",
+          line_number: 1,
+          column: 7,
+          simple_name: "SpaceInHtmlTag",
+          last_line: 1,
+          last_column: 9,
+          length: 2,
+        ),
+        instance_double(
+          ERBLint::Offense,
+          message: "Remove newline before `%>` to match start of tag.",
+          line_number: 52,
+          column: 10,
+          simple_name: "ClosingErbTagIndent",
+          last_line: 54,
+          last_column: 10,
+          length: 10,
+        ),
+      ]
+    end
+
+    let(:expected_xml) do
+      content = File.read(File.expand_path("./spec/erb_lint/fixtures/junit.xml"))
+      format(
+        content,
+        erb_lint_version: ERBLint::VERSION,
+        ruby_engine: RUBY_ENGINE,
+        ruby_version: RUBY_VERSION,
+        ruby_patchlevel: RUBY_PATCHLEVEL.to_s,
+        ruby_platform: RUBY_PLATFORM
+      )
+    end
+
+    it "displays formatted offenses output" do
+      expect { subject }.to(output(expected_xml).to_stdout)
+    end
+  end
+end

From 89ae2ee27721fa38ba2756dd191c7d50252fc943 Mon Sep 17 00:00:00 2001
From: mikoto2000 <mikoto2000@gmail.com>
Date: Fri, 26 May 2023 09:30:50 +0900
Subject: [PATCH 83/85] Add junit reporter explanation in README

---
 README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/README.md b/README.md
index 06f3beef..2e2010d7 100644
--- a/README.md
+++ b/README.md
@@ -624,6 +624,28 @@ app/views/users/_graph.html.erb:27:37: Extra space detected where there should b
 2 error(s) were found in ERB files
 ```
 
+### JUnit
+
+```sh
+erblint --format junit
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="erblint" tests="2" failures="2">
+  <properties>
+    <property name="erb_lint_version" value="%{erb_lint_version}"/>
+    <property name="ruby_engine" value="%{ruby_engine}"/>
+    <property name="ruby_version" value="%{ruby_version}"/>
+    <property name="ruby_patchlevel" value="%{ruby_patchlevel}"/>
+    <property name="ruby_platform" value="%{ruby_platform}"/>
+  </properties>
+  <testcase name="app/views/subscriptions/_loader.html.erb" file="app/views/subscriptions/_loader.html.erb" lineno="1">
+    <failure message="SpaceInHtmlTag: Extra space detected where there should be no space." type="SpaceInHtmlTag">
+      <![CDATA[app/views/subscriptions/_loader.html.erb:1:7]]>
+    </failure>
+  </testcase>
+  <testcase name="app/views/application/index.html.erb" file="app/views/subscriptions/_menu.html.erb"/>
+</testsuite>
+```
+
 ## Caching
 
 The cache is currently opt-in - to turn it on, use the `--cache` option:

From b0f68a9daf345d6fe19c4814063f565b273f4f06 Mon Sep 17 00:00:00 2001
From: Matijs van Zuijlen <matijs@matijs.net>
Date: Wed, 31 May 2023 14:10:39 +0200
Subject: [PATCH 84/85] Make HardCodedString linter ignore &times; (#284)

This is a symbol that does not need translating.
---
 lib/erb_lint/linters/hard_coded_string.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/erb_lint/linters/hard_coded_string.rb b/lib/erb_lint/linters/hard_coded_string.rb
index 2c9c82fd..da19076c 100644
--- a/lib/erb_lint/linters/hard_coded_string.rb
+++ b/lib/erb_lint/linters/hard_coded_string.rb
@@ -40,6 +40,7 @@ class HardCodedString < Linter
         "&ensp;",
         "&emsp;",
         "&thinsp;",
+        "&times;",
       ])
 
       class ConfigSchema < LinterConfig

From 9ef15e20da0ad46077c88b73bac06e4edd15d2c2 Mon Sep 17 00:00:00 2001
From: mikoto2000 <mikoto2000@gmail.com>
Date: Sun, 4 Jun 2023 01:23:36 +0900
Subject: [PATCH 85/85] Updated failure tag's text content in junit reporter.

---
 README.md                                | 2 +-
 lib/erb_lint/reporters/junit_reporter.rb | 2 +-
 spec/erb_lint/fixtures/junit.xml         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2e2010d7..05143499 100644
--- a/README.md
+++ b/README.md
@@ -639,7 +639,7 @@ erblint --format junit
   </properties>
   <testcase name="app/views/subscriptions/_loader.html.erb" file="app/views/subscriptions/_loader.html.erb" lineno="1">
     <failure message="SpaceInHtmlTag: Extra space detected where there should be no space." type="SpaceInHtmlTag">
-      <![CDATA[app/views/subscriptions/_loader.html.erb:1:7]]>
+      <![CDATA[SpaceInHtmlTag: Extra space detected where there should be no space. at app/views/subscriptions/_loader.html.erb:1:7]]>
     </failure>
   </testcase>
   <testcase name="app/views/application/index.html.erb" file="app/views/subscriptions/_menu.html.erb"/>
diff --git a/lib/erb_lint/reporters/junit_reporter.rb b/lib/erb_lint/reporters/junit_reporter.rb
index 7ae1897f..862559b4 100644
--- a/lib/erb_lint/reporters/junit_reporter.rb
+++ b/lib/erb_lint/reporters/junit_reporter.rb
@@ -102,7 +102,7 @@ def create_failure(filename, offense)
         failure_element.add_attribute("message", "#{type}: #{message}")
         failure_element.add_attribute("type", type.to_s)
 
-        cdata_element = REXML::CData.new("#{filename}:#{offense.line_number}:#{offense.column}")
+        cdata_element = REXML::CData.new("#{type}: #{message} at #{filename}:#{offense.line_number}:#{offense.column}")
         failure_element.add_text(cdata_element)
 
         failure_element
diff --git a/spec/erb_lint/fixtures/junit.xml b/spec/erb_lint/fixtures/junit.xml
index dcacebf9..61647e4e 100644
--- a/spec/erb_lint/fixtures/junit.xml
+++ b/spec/erb_lint/fixtures/junit.xml
@@ -9,12 +9,12 @@
   </properties>
   <testcase name="app/views/subscriptions/_loader.html.erb" file="app/views/subscriptions/_loader.html.erb" lineno="1">
     <failure message="SpaceInHtmlTag: Extra space detected where there should be no space." type="SpaceInHtmlTag">
-      <![CDATA[app/views/subscriptions/_loader.html.erb:1:7]]>
+      <![CDATA[SpaceInHtmlTag: Extra space detected where there should be no space. at app/views/subscriptions/_loader.html.erb:1:7]]>
     </failure>
   </testcase>
   <testcase name="app/views/subscriptions/_loader.html.erb" file="app/views/subscriptions/_loader.html.erb" lineno="52">
     <failure message="ClosingErbTagIndent: Remove newline before `%%&gt;` to match start of tag." type="ClosingErbTagIndent">
-      <![CDATA[app/views/subscriptions/_loader.html.erb:52:10]]>
+      <![CDATA[ClosingErbTagIndent: Remove newline before `%%>` to match start of tag. at app/views/subscriptions/_loader.html.erb:52:10]]>
     </failure>
   </testcase>
   <testcase name="app/views/application/index.html.erb" file="app/views/application/index.html.erb"/>