Merge pull request #8896 from reitermarkus/sorbet-inline

Inline type annotations.

.github/workflows/sorbet.yml

@@ -1,4 +1,4 @@
-name: Update Sorbet-related files
+name: Update Sorbet files
 on:
   push:
     paths:
@@ -39,7 +39,8 @@ jobs:
 
           if brew typecheck --update --fail-if-not-changed; then
             git add "$GITHUB_WORKSPACE/Library/Homebrew/sorbet"
-            git commit -m "sorbet: Update RBI files and prune files.yaml." -m "Autogenerated by [a scheduled GitHub Action](https://github.com/Homebrew/brew/blob/master/.github/workflows/sorbet.yml)."
+            git commit -m "sorbet: Update RBI files." \
+                       -m "Autogenerated by the [sorbet](https://github.com/Homebrew/brew/blob/master/.github/workflows/sorbet.yml) workflow."
             echo "::set-output name=committed::true"
             if [ -n "$BRANCH_EXISTS" ]; then
               echo "::set-output name=pull_request::true"

Library/.rubocop.yml

@@ -12,7 +12,12 @@ AllCops:
   DisplayCopNames: false
   # enable all pending rubocops
   NewCops: enable
+  Include:
+    - '**/*.rbi'
   Exclude:
+    - 'Homebrew/sorbet/rbi/gems/**/*.rbi'
+    - 'Homebrew/sorbet/rbi/hidden-definitions/**/*.rbi'
+    - 'Homebrew/sorbet/rbi/todo.rbi'
     - 'Homebrew/bin/*'
     - 'Homebrew/vendor/**/*'
 
@@ -62,6 +67,10 @@ Naming/HeredocDelimiterNaming:
   ForbiddenDelimiters:
     - END, EOD, EOF
 
+Naming/MethodName:
+  IgnoredPatterns:
+    - '\AHEAD\?\Z'
+
 # Allow dashes in filenames.
 Naming/FileName:
   Regex: !ruby/regexp /^[\w\@\-\+\.]+(\.rb)?$/
@@ -264,9 +273,14 @@ Layout/LineLength:
                     ' "~/Library/Application Support/', '"~/Library/Caches/', '"~/Application Support',
                     ' was verified as official when first introduced to the cask']
 
-# Enable once we are using `sorbet-runtime`.
 Sorbet/FalseSigil:
-  Enabled: false
+  Exclude:
+    - 'Taps/**/*.rb'
+    - 'Homebrew/test/**/Casks/**/*.rb'
+
+Sorbet/StrictSigil:
+  Include:
+    - '**/*.rbi'
 
 # Try getting rid of these.
 Sorbet/ConstantsFromStrings:
@@ -302,6 +316,7 @@ Style/ClassVars:
 Style/Documentation:
   Exclude:
     - 'Taps/**/*'
+    - '**/*.rbi'
 
 Style/DocumentationMethod:
   Include:
@@ -313,6 +328,7 @@ Style/FrozenStringLiteralComment:
   Exclude:
     - 'Taps/*/*/{Formula,Casks,}/*.rb'
     - 'Homebrew/test/**/Casks/**/*.rb'
+    - '**/*.rbi'
 
 # TODO: remove this when possible.
 Style/GlobalVars:

Library/Homebrew/.rubocop.yml

@@ -45,10 +45,6 @@ Naming/PredicateName:
   # Can't rename these.
   AllowedMethods: is_32_bit?, is_64_bit?
 
-Style/FrozenStringLiteralComment:
-  Exclude:
-    - '**/Casks/**/*.rb'
-
 Style/HashAsLastArrayItem:
   Exclude:
     - 'test/utils/spdx_spec.rb'

Library/Homebrew/PATH.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 # Represention of a `*PATH` environment variable.

Library/Homebrew/bintray.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "utils/curl"

Library/Homebrew/brew.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 if ENV["HOMEBREW_STACKPROF"]

Library/Homebrew/build.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 # This script is loaded by formula_installer as a separate instance.

Library/Homebrew/build_environment.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 # Settings for the build environment.

Library/Homebrew/build_options.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 # Options for a formula build.

Library/Homebrew/cache_store.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "json"

Library/Homebrew/cask.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact"

Library/Homebrew/cask/artifact.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/app"

Library/Homebrew/cask/artifact/abstract_artifact.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/artifact/abstract_flight_block.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "cask/artifact/abstract_artifact"

Library/Homebrew/cask/artifact/abstract_uninstall.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "timeout"

Library/Homebrew/cask/artifact/app.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/artifact.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/audio_unit_plugin.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/binary.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "cask/artifact/symlinked"

Library/Homebrew/cask/artifact/colorpicker.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/dictionary.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/font.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/input_method.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/installer.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/artifact/abstract_artifact"

Library/Homebrew/cask/artifact/internet_plugin.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/manpage.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "cask/artifact/symlinked"

Library/Homebrew/cask/artifact/mdimporter.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/moved.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/artifact/relocated"

Library/Homebrew/cask/artifact/pkg.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "plist"

Library/Homebrew/cask/artifact/postflight_block.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/abstract_flight_block"

Library/Homebrew/cask/artifact/preflight_block.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/abstract_flight_block"

Library/Homebrew/cask/artifact/prefpane.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/qlplugin.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/relocated.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "cask/artifact/abstract_artifact"

Library/Homebrew/cask/artifact/screen_saver.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/service.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/stage_only.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "cask/artifact/abstract_artifact"

Library/Homebrew/cask/artifact/suite.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/symlinked.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/artifact/relocated"

Library/Homebrew/cask/artifact/uninstall.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/artifact/abstract_uninstall"

Library/Homebrew/cask/artifact/vst3_plugin.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/vst_plugin.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/artifact/moved"

Library/Homebrew/cask/artifact/zap.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/artifact/abstract_uninstall"

Library/Homebrew/cask/audit.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/denylist"

Library/Homebrew/cask/auditor.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "cask/audit"

Library/Homebrew/cask/cache.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cask.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/cask_loader"

Library/Homebrew/cask/cask_loader.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/cache"

Library/Homebrew/cask/caskroom.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "utils/user"

Library/Homebrew/cask/cmd.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "optparse"

Library/Homebrew/cask/cmd/--cache.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/abstract_command.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "search"

Library/Homebrew/cask/cmd/abstract_internal_command.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/audit.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "utils/github/actions"

Library/Homebrew/cask/cmd/cat.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/create.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/doctor.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/edit.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/fetch.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/help.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/home.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/info.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "json"

Library/Homebrew/cask/cmd/install.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/internal_help.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/internal_stanza.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/dsl"

Library/Homebrew/cask/cmd/list.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/artifact/relocated"

Library/Homebrew/cask/cmd/outdated.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/reinstall.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/style.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "json"

Library/Homebrew/cask/cmd/uninstall.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/cmd/upgrade.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "env_config"

Library/Homebrew/cask/cmd/zap.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/config.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "json"

Library/Homebrew/cask/denylist.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/download.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "fileutils"

Library/Homebrew/cask/dsl.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "locale"

Library/Homebrew/cask/dsl/appcast.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/dsl/base.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "cask/utils"

Library/Homebrew/cask/dsl/caveats.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/dsl/conflicts_with.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "delegate"

Library/Homebrew/cask/dsl/container.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "unpack_strategy"

Library/Homebrew/cask/dsl/depends_on.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "delegate"

Library/Homebrew/cask/dsl/postflight.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "cask/staged"

Library/Homebrew/cask/dsl/preflight.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/dsl/uninstall_postflight.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/dsl/uninstall_preflight.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require "cask/staged"

Library/Homebrew/cask/dsl/version.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/exceptions.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/installer.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "formula_installer"

Library/Homebrew/cask/macos.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "os/mac/version"

Library/Homebrew/cask/metadata.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask/pkg.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "cask/macos"

Library/Homebrew/cask/quarantine.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "development_tools"

Library/Homebrew/cask/staged.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "utils/user"

Library/Homebrew/cask/topological_hash.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "tsort"

Library/Homebrew/cask/url.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: true
 # frozen_string_literal: true
 
 # Class corresponding to the `url` stanza.

Library/Homebrew/cask/utils.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "utils/user"

Library/Homebrew/cask/verify.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Cask

Library/Homebrew/cask_dependent.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 # An adapter for casks to provide dependency information in a formula-like interface

Library/Homebrew/caveats.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require "language/python"