Merge pull request #16586 from dduugg/no-hidden-rbi

Remove use of hidden-definitions

.gitignore

@@ -21,7 +21,6 @@
 /Library/Taps
 /Library/PinnedTaps
 /Library/Homebrew/.byebug_history
-/Library/Homebrew/sorbet/rbi/hidden-definitions/errors.txt
 
 # Ignore Bundler files
 **/.bundle/bin

Library/.rubocop.yml

@@ -18,7 +18,6 @@ AllCops:
     - "**/*.rbi"
   Exclude:
     - "Homebrew/sorbet/rbi/gems/**/*.rbi"
-    - "Homebrew/sorbet/rbi/hidden-definitions/*.rbi"
     - "Homebrew/bin/*"
     - "Homebrew/vendor/**/*"
     - "Taps/*/*/vendor/**/*"
@@ -69,6 +68,7 @@ Homebrew/NegateInclude:
     # `exclude?` is not available here:
     - "Homebrew/standalone/init.rb"
     - "Homebrew/rubocops/**/*"
+    - "Homebrew/sorbet/tapioca/**/*"
 
 # `system` is a special case and aligns on second argument, so allow this for formulae.
 Layout/ArgumentAlignment:

Library/Homebrew/Gemfile

@@ -60,6 +60,7 @@ group :tests, optional: true do
   gem "simplecov-cobertura", require: false
 end
 group :typecheck, optional: true do
+  gem "method_source", require: false
   gem "parlour", require: false
   gem "sorbet-static-and-runtime", require: false
   gem "spoom", require: false

Library/Homebrew/Gemfile.lock

@@ -176,6 +176,7 @@ DEPENDENCIES
   bootsnap
   byebug
   json_schemer
+  method_source
   minitest
   parallel_tests
   parlour

Library/Homebrew/dev-cmd/typecheck.rb

@@ -45,8 +45,11 @@ def self.typecheck
 
     HOMEBREW_LIBRARY_PATH.cd do
       if update
+        safe_system "bundle", "exec", "tapioca", "dsl"
+        # RBI files already provided by Sorbet:
         excluded_gems = [
-          "json", # RBI file is already provided by Sorbet
+          "json",
+          "msgpack",
         ]
         tapioca_args = ["--exclude", *excluded_gems, "--pre", "sorbet/tapioca/prerequire.rb"]
         tapioca_args << "--all" if args.update_all?
@@ -59,18 +62,6 @@ def self.typecheck
         safe_system "bundle", "exec", "tapioca", "gem", *tapioca_args
         safe_system "bundle", "exec", "parlour"
 
-        safe_system({ "RUBYLIB" => "#{HOMEBREW_LIBRARY_PATH}/sorbet/hidden_definitions_hacks" },
-                    "bundle", "exec", "srb", "rbi", "hidden-definitions")
-        # HACK: we'll phase out hidden-definitions soon
-        tmp_file = "sorbet/rbi/hidden-definitions/hidden.rbi.tmp"
-        orig_file = "sorbet/rbi/hidden-definitions/hidden.rbi"
-        File.open(tmp_file, "w") do |out_file|
-          File.foreach(orig_file) do |line|
-            out_file.puts line unless line.include?("def self.new(*args, **arg, &blk); end")
-          end
-        end
-        File.rename(tmp_file, orig_file)
-
         if args.suggest_typed?
           ohai "Bumping Sorbet `typed` sigils..."
           # --sorbet needed because of https://github.com/Shopify/spoom/issues/488

Library/Homebrew/extend/ENV/shared.rb

@@ -60,7 +60,7 @@ def reset
   end
   private :reset
 
-  sig { returns(T::Hash[String, String]) }
+  sig { returns(T::Hash[String, T.nilable(String)]) }
   def remove_cc_etc
     keys = %w[CC CXX OBJC OBJCXX LD CPP CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS LDFLAGS CPPFLAGS]
     keys.to_h { |key| [key, delete(key)] }

Library/Homebrew/formula_cellar_checks.rb

@@ -355,11 +355,11 @@ def check_binary_arches(formula)
     else
       true
     end
-    return if mismatches.empty? && universal_binaries_expected
+    return if T.must(mismatches).empty? && universal_binaries_expected
 
     mismatches_expected = formula.tap.blank? ||
                           formula.tap.audit_exception(:mismatched_binary_allowlist, formula.name)
-    return if compatible_universal_binaries.empty? && mismatches_expected
+    return if T.must(compatible_universal_binaries).empty? && mismatches_expected
 
     return if universal_binaries_expected && mismatches_expected
 

Library/Homebrew/rubocops/cask/extend/node.rb

@@ -8,17 +8,11 @@ class Node
       include RuboCop::Cask::Constants
 
       def_node_matcher :method_node, "{$(send ...) (block $(send ...) ...)}"
-      def_node_matcher :block_args,  "(block _ $_ _)"
       def_node_matcher :block_body,  "(block _ _ $_)"
-
-      def_node_matcher :key_node,    "{(pair $_ _) (hash (pair $_ _) ...)}"
-      def_node_matcher :val_node,    "{(pair _ $_) (hash (pair _ $_) ...)}"
-
       def_node_matcher :cask_block?, "(block (send nil? :cask ...) args ...)"
       def_node_matcher :on_system_block?,
                        "(block (send nil? {#{ON_SYSTEM_METHODS.map(&:inspect).join(" ")}} ...) args ...)"
       def_node_matcher :arch_variable?, "(lvasgn _ (send nil? :on_arch_conditional ...))"
-
       def_node_matcher :begin_block?, "(begin ...)"
 
       sig { returns(T::Boolean) }

Library/Homebrew/rubocops/cask/extend/node.rbi

@@ -0,0 +1,21 @@
+# typed: strict
+
+class RuboCop::AST::Node
+  sig { returns(T.nilable(RuboCop::AST::SendNode)) }
+  def method_node; end
+
+  sig { returns(T.nilable(RuboCop::AST::Node)) }
+  def block_body; end
+
+  sig { returns(T::Boolean) }
+  def cask_block?; end
+
+  sig { returns(T::Boolean) }
+  def on_system_block?; end
+
+  sig { returns(T::Boolean) }
+  def arch_variable?; end
+
+  sig { returns(T::Boolean) }
+  def begin_block?; end
+end

Library/Homebrew/rubocops/cask/mixin/cask_help.rb

@@ -6,7 +6,7 @@ module Cop
     module Cask
       # Common functionality for cops checking casks.
       module CaskHelp
-        prepend CommentsHelp
+        prepend CommentsHelp # Update the rbi file if changing this: https://github.com/sorbet/sorbet/issues/259
 
         sig { overridable.params(cask_block: RuboCop::Cask::AST::CaskBlock).void }
         def on_cask(cask_block); end

Library/Homebrew/rubocops/cask/mixin/cask_help.rbi

@@ -1,5 +1,7 @@
 # typed: strict
 
 module RuboCop::Cop::Cask::CaskHelp
+  # Sorbet doesn't understand `prepend`: https://github.com/sorbet/sorbet/issues/259
+  include RuboCop::Cop::CommentsHelp
   requires_ancestor { RuboCop::Cop::Base }
 end

Library/Homebrew/software_spec.rb

@@ -192,7 +192,7 @@ def depends_on(spec)
   def uses_from_macos(deps, bounds = {})
     if deps.is_a?(Hash)
       bounds = deps.dup
-      deps = [bounds.shift].to_h
+      deps = [T.unsafe(bounds).shift].to_h
     end
 
     spec, tags = deps.is_a?(Hash) ? deps.first : deps

Library/Homebrew/sorbet/rbi/dsl/.gitattributes

@@ -0,0 +1 @@
+**/*.rbi linguist-generated=true