Bump some utils/ files to Sorbet typed: strict
#19094
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MikeMcQuaid
approved these changes
Jan 15, 2025
Comment on lines
+171
to
172
| !!(config_true?(:analyticsmessage) && | ||
| config_true?(:caskanalyticsmessage) && |
There was a problem hiding this comment.
Suggested change
| !!(config_true?(:analyticsmessage) && | |
| config_true?(:caskanalyticsmessage) && | |
| return false unless config_true?(:analyticsmessage) | |
| return false unless config_true?(:caskanalyticsmessage) | |
| influx_message_displayed? |
There was a problem hiding this comment.
Or something? I presume the issue here is that config_true? can be nil? If so: may make sense to fix that up.
| config_true?(:caskanalyticsmessage) && | ||
| influx_message_displayed? | ||
| influx_message_displayed?) |
There was a problem hiding this comment.
Suggested change
| influx_message_displayed?) |
| @@ -97,8 +97,8 @@ def pypi_info(new_version: nil) | |||
| sig { returns(String) } | |||
| def to_s | |||
| if valid_pypi_package? | |||
| out = name | |||
| out += "[#{extras.join(",")}]" if extras.present? | |||
| out = T.must(name) | |||
There was a problem hiding this comment.
If we're doing a T.must here feels like it might be nice to enforce in def name and def initialize that it's a String type instead?
| out = name | ||
| out += "[#{extras.join(",")}]" if extras.present? | ||
| out = T.must(name) | ||
| out += "[#{extras&.join(",")}]" if extras.present? |
There was a problem hiding this comment.
Suggested change
| out += "[#{extras&.join(",")}]" if extras.present? | |
| if (pypi_extras = extras.presence) | |
| out += "[#{pypi_extras.join(",")}]" | |
| end |
| @@ -327,12 +328,12 @@ def self.update_python_resources!(formula, version: nil, package_name: nil, extr | |||
| # Resolve the dependency tree of all input packages | |||
| show_info = !print_only && !silent | |||
| ohai "Retrieving PyPI dependencies for \"#{input_packages.join(" ")}\"..." if show_info | |||
| found_packages = pip_report(input_packages, python_name:, print_stderr: verbose && show_info) | |||
| found_packages = pip_report(input_packages, python_name:, print_stderr: !(verbose && show_info).nil?) | |||
There was a problem hiding this comment.
Suggested change
| found_packages = pip_report(input_packages, python_name:, print_stderr: !(verbose && show_info).nil?) | |
| print_stderr = !(verbose && show_info).nil? | |
| found_packages = pip_report(input_packages, python_name:, print_stderr:) |
| # Resolve the dependency tree of excluded packages to prune the above | ||
| exclude_packages.delete_if { |package| found_packages.exclude? package } | ||
| ohai "Retrieving PyPI dependencies for excluded \"#{exclude_packages.join(" ")}\"..." if show_info | ||
| exclude_packages = pip_report(exclude_packages, python_name:, print_stderr: verbose && show_info) | ||
| exclude_packages += [Package.new(main_package.name)] unless main_package.nil? | ||
| exclude_packages = pip_report(exclude_packages, python_name:, print_stderr: !(verbose && show_info).nil?) |
There was a problem hiding this comment.
Suggested change
| exclude_packages = pip_report(exclude_packages, python_name:, print_stderr: !(verbose && show_info).nil?) | |
| print_stderr = !(verbose && show_info).nil? | |
| exclude_packages = pip_report(exclude_packages, python_name:, print_stderr:) |
| exclude_packages = pip_report(exclude_packages, python_name:, print_stderr: verbose && show_info) | ||
| exclude_packages += [Package.new(main_package.name)] unless main_package.nil? | ||
| exclude_packages = pip_report(exclude_packages, python_name:, print_stderr: !(verbose && show_info).nil?) | ||
| exclude_packages += [Package.new(T.must(main_package.name))] unless main_package.nil? |
There was a problem hiding this comment.
Suggested change
| exclude_packages += [Package.new(T.must(main_package.name))] unless main_package.nil? | |
| if (main_package_name = main_package&.name) | |
| exclude_packages += [Package.new(main_package_name)] | |
| end |
| tcsh: "~/.tcshrc", | ||
| zsh: "~/.zshrc", | ||
| }.freeze, | ||
| T::Hash[T.nilable(Symbol), String], |
There was a problem hiding this comment.
Suggested change
| T::Hash[T.nilable(Symbol), String], | |
| T::Hash[Symbol, String], |
feels more appropriate?
Comment on lines
+47
to
+52
| T::Hash[T.any(Symbol, String), T.untyped], | ||
| T::Array[String], | ||
| ), | ||
| ).returns( | ||
| [ | ||
| T::Array[T.any(String, Symbol)], T::Array[String] |
There was a problem hiding this comment.
Would be nice if this could use either String or Symbol consistently as the Hash keys/first Array values? Maybe outside the scope of this PR.
| @@ -152,7 +162,7 @@ def color? | |||
| return false if Homebrew::EnvConfig.no_color? | |||
| return true if Homebrew::EnvConfig.color? | |||
|
|
|||
| @stream.tty? | |||
| !!@stream&.tty? | |||
There was a problem hiding this comment.
Would be nice to avoid the added need for & here if possible.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
brew stylewith your changes locally?brew typecheckwith your changes locally?brew testswith your changes locally?typed: strictin all (non-package) files in Homebrew organisation #17297.