Merge pull request #16775 from reitermarkus/tap-sig-2

Simplify `Tap#cask_files_by_name`.

Library/Homebrew/cask/cask_loader.rb

@@ -588,8 +588,7 @@ def self.default_path(token)
  def self.find_cask_in_tap(token, tap)
  filename = "#{token}.rb"
 
- Tap.cask_files_by_name(tap)
- .fetch(token, tap.cask_dir/filename)
+ tap.cask_files_by_name.fetch(token, tap.cask_dir/filename)
  end
  end
 end

Library/Homebrew/tap.rb

@@ -129,6 +129,7 @@ def clear_cache
  @formula_names = nil
  @formula_files = nil
  @cask_files = nil
+ @cask_files_by_name = nil
  @alias_dir = nil
  @alias_files = nil
  @aliases = nil
@@ -590,19 +591,12 @@ def cask_files
  end
  end
 
- # A cached hash of {Cask} basenames to {Cask} file pathnames for a {Tap}
- sig { params(tap: Tap).returns(T::Hash[String, Pathname]) }
- def self.cask_files_by_name(tap)
- cache_key = "cask_files_by_name_#{tap}"
- cache.fetch(cache_key) do |key|
- cache[key] = tap.cask_files_by_name
- end
- end
-
+ # A mapping of {Cask} tokens to {Cask} file paths.
+ #
  # @private
  sig { returns(T::Hash[String, Pathname]) }
  def cask_files_by_name
- cask_files.each_with_object({}) do |file, hash|
+ @cask_files_by_name ||= cask_files.each_with_object({}) do |file, hash|
  # If there's more than one file with the same basename: use the longer one to prioritise more specific results.
  basename = file.basename(".rb").to_s
  existing_file = hash[basename]