From 37945a407e683c5b633dc30030c857edb7b5505a Mon Sep 17 00:00:00 2001
From: hyuraku <32809703+hyuraku@users.noreply.github.com>
Date: Thu, 6 Jan 2022 22:33:27 +0900
Subject: [PATCH 1/2] repair cask formulae autoremove

---
 Library/Homebrew/cmd/autoremove.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/cmd/autoremove.rb b/Library/Homebrew/cmd/autoremove.rb
index 32162dd1e2..17d4781f8f 100644
--- a/Library/Homebrew/cmd/autoremove.rb
+++ b/Library/Homebrew/cmd/autoremove.rb
@@ -36,9 +36,10 @@ module Homebrew
     removable_formulae = get_removable_formulae(Formula.installed)
 
     if (casks = Cask::Caskroom.casks.presence)
-      removable_formulae -= casks.flat_map { |cask| cask.depends_on[:formula] }
-                                 .compact
-                                 .map { |formula| Formula[formula] }
+      cask_formulae = casks.flat_map { |cask| cask.depends_on[:formula] }
+                           .compact
+                           .map { |formula| Formula[formula] }
+      removable_formulae -= [*cask_formulae, *cask_formulae.flat_map(&:runtime_formula_dependencies)]
     end
     return if removable_formulae.blank?
 

From 1fd4c4d840778b7679e49a9eaecf67da0dfc1172 Mon Sep 17 00:00:00 2001
From: hyuraku <32809703+hyuraku@users.noreply.github.com>
Date: Fri, 7 Jan 2022 21:05:36 +0900
Subject: [PATCH 2/2] rename variables and repair style

---
 Library/Homebrew/cmd/autoremove.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Library/Homebrew/cmd/autoremove.rb b/Library/Homebrew/cmd/autoremove.rb
index 17d4781f8f..a80cb4ae49 100644
--- a/Library/Homebrew/cmd/autoremove.rb
+++ b/Library/Homebrew/cmd/autoremove.rb
@@ -36,10 +36,10 @@ module Homebrew
     removable_formulae = get_removable_formulae(Formula.installed)
 
     if (casks = Cask::Caskroom.casks.presence)
-      cask_formulae = casks.flat_map { |cask| cask.depends_on[:formula] }
-                           .compact
-                           .map { |formula| Formula[formula] }
-      removable_formulae -= [*cask_formulae, *cask_formulae.flat_map(&:runtime_formula_dependencies)]
+      removable_formulae -= casks.flat_map { |cask| cask.depends_on[:formula] }
+                                 .compact
+                                 .map { |f| Formula[f] }
+                                 .flat_map { |f| [f, *f.runtime_formula_dependencies].compact }
     end
     return if removable_formulae.blank?