rubocop-sorbet 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddc9a9caf478aaa31d5b985064aadc77e9e2d199927b7db01eb5823ea2190c28
-  data.tar.gz: d440f179cff018d9ff54d68c01fafa9265d4020ca738f5311fe552b44c7d2074
+  metadata.gz: d0993b56c619f271efe5948d6a3b090695290b91d55db8948b95cf690c610cbf
+  data.tar.gz: 0f69733c05f1391747711ee316152b6541800a35682b71482d50903c8981bfdc
 SHA512:
-  metadata.gz: b046329f103125db498e57acb613d387b780c6ec00c3d433cdb88e90ed1110091f5c6a1f59f0d3907abc98e1755ef332046b545b8dd54665939d997716ecf057
-  data.tar.gz: 68348b3e0ad4a8a6141526fb6c5406b42e7ea12661256f83258551b2a11c3a6c04ded7843b7398a4903fa9877cbd16c1acb4bf7f3ccce69c600fca5bc51b18bc
+  metadata.gz: aa9413ff649b22b1afab51d3e6f8c48cfb1387ff52a0d3e8547db70c42824d9d2e0da53e093b79fb57f916d07100b655368831bf23abe12c69371281185faab9
+  data.tar.gz: 8cffb6fdef999a34b5f0c92ec7c2712b993f7851b8d7cb7c9ae7c9e764bd132f4d25b3bb733bb31facfb38cc17e62cbe042ac77aee92e74df093a20e56f5c7d4

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/ci.yml

@@ -11,10 +11,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2"]
+        ruby: ["3.0", "3.1", "3.2", "3.3"]
     name: Test Ruby ${{ matrix.ruby }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -29,7 +29,7 @@ jobs:
       fail-fast: false
     name: Lint & Docs
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/stale.yml

@@ -12,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v9
         with:
           stale-pr-message: >
             This PR has been automatically marked as stale because it has not had

data/.rubocop.yml

@@ -7,7 +7,6 @@ require:
   - rubocop/cop/internal_affairs
 
 AllCops:
-  TargetRubyVersion: 2.7
   Exclude:
     - vendor/**/*
   NewCops: disable

data/.ruby-version

@@ -0,0 +1 @@
+3.2.0

data/Gemfile

@@ -7,6 +7,6 @@ gemspec
 
 gem "byebug"
 gem "rake", ">= 12.3.3"
-gem "rspec", "~> 3.7"
+gem "rspec", "~> 3.13"
 gem "rubocop-shopify", require: false
 gem "yard", "~> 0.9"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-sorbet (0.8.0)
+    rubocop-sorbet (0.8.1)
       rubocop (>= 0.90.0)
 
 GEM
@@ -9,48 +9,48 @@ GEM
   specs:
     ast (2.4.2)
     byebug (11.1.3)
-    diff-lcs (1.3)
-    json (2.6.3)
+    diff-lcs (1.5.1)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    racc (1.7.1)
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.1)
-    regexp_parser (2.8.1)
+    rake (13.2.1)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (1.55.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     rubocop-shopify (2.14.0)
       rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     yard (0.9.36)
 
 PLATFORMS
@@ -59,7 +59,7 @@ PLATFORMS
 DEPENDENCIES
   byebug
   rake (>= 12.3.3)
-  rspec (~> 3.7)
+  rspec (~> 3.13)
   rubocop-shopify
   rubocop-sorbet!
   yard (~> 0.9)

data/config/obsoletion.yml

@@ -0,0 +1,6 @@
+#
+# Configuration for obsoletion.
+#
+# See: https://docs.rubocop.org/rubocop/extensions.html#config-obsoletions
+#
+{}

data/config/rbi.yml

@@ -2,7 +2,6 @@ require:
   - rubocop-sorbet
 
 AllCops:
-  TargetRubyVersion: 3.0
   DisabledByDefault: true
   Include:
     - '**/*.rbi'

data/dev.yml

@@ -3,7 +3,7 @@ name: "rubocop-sorbet"
 type: "ruby"
 
 up:
-  - ruby: "3.2.0"
+  - ruby
   - "bundler"
 
 commands:

data/lib/rubocop/cop/sorbet/callback_conditionals_binding.rb

@@ -32,8 +32,13 @@ module RuboCop
       #       true
       #     end
       #   end
-      class CallbackConditionalsBinding < RuboCop::Cop::Cop # rubocop:todo InternalAffairs/InheritDeprecatedCopClass
-        CALLBACKS = [
+      class CallbackConditionalsBinding < RuboCop::Cop::Base
+        extend AutoCorrector
+        include Alignment
+
+        MSG = "Callback conditionals should be bound to the right type. Use T.bind(self, %{type})"
+
+        RESTRICT_ON_SEND = [
           :validate,
           :validates,
           :validates_with,
@@ -72,97 +77,56 @@ module RuboCop
           :append_after_action,
         ].freeze
 
-        def autocorrect(node)
-          lambda do |corrector|
-            options = node.each_child_node.find(&:hash_type?)
-
-            conditional = nil
-            options.each_pair do |keyword, block|
-              if keyword.value == :if || keyword.value == :unless
-                conditional = block
-                break
-              end
-            end
-
-            _, _, block = conditional.child_nodes
-
-            # Find the class node and check if it includes a namespace on the
-            # same line e.g.: Namespace::Class, which will require the fully
-            # qualified name
-
-            klass = node.ancestors.find(&:class_type?)
-
-            expected_class = if klass.children.first.children.first.nil?
-              node.parent_module_name.split("::").last
-            else
-              klass.identifier.source
-            end
-
-            do_end_lambda = conditional.source.include?("do") && conditional.source.include?("end")
+        # @!method argumentless_unbound_callable_callback_conditional?(node)
+        def_node_matcher :argumentless_unbound_callable_callback_conditional?, <<~PATTERN
+          (pair (sym {:if :unless})                          # callback conditional
+            $(block
+              (send nil? {:lambda :proc})                    # callable
+              (args)                                         # argumentless
+              !`(send(const {cbase nil?} :T) :bind self $_ ) # unbound
+            )
+          )
+        PATTERN
 
-            unless do_end_lambda
-              # We are converting a one line lambda into a multiline
-              # Remove the space after the `{`
-              if /{\s/.match?(conditional.source)
-                corrector.remove_preceding(block, 1)
+        def on_send(node)
+          type = immediately_enclosing_module_name(node)
+          return unless type
+
+          node.arguments.each do |arg|
+            next unless arg.hash_type? # Skip non-keyword arguments
+
+            arg.each_child_node do |pair_node|
+              argumentless_unbound_callable_callback_conditional?(pair_node) do |block|
+                add_offense(pair_node, message: format(MSG, type: type)) do |corrector|
+                  block_opening_indentation = block.source_range.source_line[/\A */]
+                  block_body_indentation    = block_opening_indentation + SPACE * configured_indentation_width
+
+                  if block.single_line? # then convert to multi-line block first
+                    # 1. Replace whitespace (if any) between the opening delimiter and the block body,
+                    #    with newline and the correct indentation for the block body.
+                    preceeding_whitespace_range = block.loc.begin.end.join(block.body.source_range.begin)
+                    corrector.replace(preceeding_whitespace_range, "\n#{block_body_indentation}")
+
+                    # 2. Replace whitespace (if any) between the block body and the closing delimiter,
+                    #    with newline and the same indentation as the block opening.
+                    trailing_whitespace_range = block.body.source_range.end.join(block.loc.end.begin)
+                    corrector.replace(trailing_whitespace_range, "\n#{block_opening_indentation}")
+                  end
+
+                  # Prepend the binding to the block body
+                  corrector.insert_before(block.body, "T.bind(self, #{type})\n#{block_body_indentation}")
+                end
               end
-
-              # Remove the last space and `}` and re-add it with a line break
-              # and the correct indentation
-              base_indentation = " " * node.loc.column
-              chars_to_remove = /\s}/.match?(conditional.source) ? 2 : 1
-              corrector.remove_trailing(conditional, chars_to_remove)
-              corrector.insert_after(block, "\n#{base_indentation}}")
             end
-
-            # Add the T.bind
-            indentation = " " * (node.loc.column + 2)
-            line_start = do_end_lambda ? "" : "\n#{indentation}"
-            bind = "#{line_start}T.bind(self, #{expected_class})\n#{indentation}"
-
-            corrector.insert_before(block, bind)
           end
         end
 
-        def on_send(node)
-          return unless CALLBACKS.include?(node.method_name)
-
-          options = node.each_child_node.find(&:hash_type?)
-          return if options.nil?
-
-          conditional = nil
-          options.each_pair do |keyword, block|
-            next unless keyword.sym_type?
-
-            if keyword.value == :if || keyword.value == :unless
-              conditional = block
-              break
-            end
-          end
-
-          return if conditional.nil? || conditional.array_type? || conditional.child_nodes.empty?
-
-          return unless conditional.arguments.empty?
+        private
 
-          type, _, block = conditional.child_nodes
-          return unless type.lambda_or_proc? || type.block_literal?
-
-          klass = node.ancestors.find(&:class_type?)
-
-          expected_class = if klass&.children&.first&.children&.first.nil?
-            node.parent_module_name&.split("::")&.last
-          else
-            klass.identifier.source
-          end
-
-          return if expected_class.nil?
-
-          unless block.source.include?("T.bind(self")
-            add_offense(
-              node,
-              message: "Callback conditionals should be bound to the right type. Use T.bind(self, #{expected_class})",
-            )
-          end
+        # Find the immediately enclosing class or module name.
+        # Returns `nil`` if the immediate parent (skipping begin if present) is not a class or module.
+        def immediately_enclosing_module_name(node)
+          (node.parent&.begin_type? ? node.parent.parent : node.parent)&.defined_module_name
         end
       end
     end

data/lib/rubocop/cop/sorbet/constants_from_strings.rb

@@ -33,21 +33,18 @@ module RuboCop
       #
       #   # good
       #   { "User" => User }.fetch(class_name)
-      class ConstantsFromStrings < ::RuboCop::Cop::Cop # rubocop:todo InternalAffairs/InheritDeprecatedCopClass
-        # @!method constant_from_string?(node)
-        def_node_matcher(:constant_from_string?, <<-PATTERN)
-          (send _ {:constantize :constants :const_get} ...)
-        PATTERN
+      class ConstantsFromStrings < ::RuboCop::Cop::Base
+        MSG = "Don't use `%<method_name>s`, it makes the code harder to understand, less editor-friendly, " \
+          "and impossible to analyze. Replace `%<method_name>s` with a case/when or a hash."
 
-        def on_send(node)
-          return unless constant_from_string?(node)
+        RESTRICT_ON_SEND = [
+          :constantize,
+          :constants,
+          :const_get,
+        ].freeze
 
-          add_offense(
-            node,
-            location: :selector,
-            message: "Don't use `#{node.method_name}`, it makes the code harder to understand, less editor-friendly, " \
-              "and impossible to analyze. Replace `#{node.method_name}` with a case/when or a hash.",
-          )
+        def on_send(node)
+          add_offense(node.selector, message: format(MSG, method_name: node.method_name))
         end
       end
     end

data/lib/rubocop/cop/sorbet/forbid_t_struct.rb

@@ -79,7 +79,7 @@ module RuboCop
             return unless t_struct_prop?(node)
 
             kind = node.method?(:const) ? :attr_reader : :attr_accessor
-            name = node.arguments[0].source.delete_prefix(":")
+            name = node.first_argument.source.delete_prefix(":")
             type = node.arguments[1].source
             default = nil
             factory = nil

data/lib/rubocop/cop/sorbet/sigils/valid_sigil.rb

@@ -29,7 +29,8 @@ module RuboCop
           strictness = extract_strictness(sigil)
           return unless check_strictness_not_empty(sigil, strictness)
           return unless check_strictness_valid(sigil, strictness)
-          return unless check_strictness_level(sigil, strictness)
+
+          nil unless check_strictness_level(sigil, strictness)
         end
 
         def autocorrect(_node)

data/lib/rubocop/sorbet/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module Sorbet
-    VERSION = "0.8.0"
+    VERSION = "0.8.1"
   end
 end

data/lib/rubocop/sorbet.rb

@@ -12,5 +12,7 @@ module RuboCop
     CONFIG         = YAML.safe_load(CONFIG_DEFAULT.read).freeze
 
     private_constant(:CONFIG_DEFAULT, :PROJECT_ROOT)
+
+    ::RuboCop::ConfigObsoletion.files << PROJECT_ROOT.join("config", "obsoletion.yml")
   end
 end

data/rubocop-sorbet.gemspec

@@ -12,6 +12,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/shopify/rubocop-sorbet"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = ">= 3.0"
+
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/shopify/rubocop-sorbet"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-sorbet
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-18 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -35,6 +35,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
+- ".github/dependabot.yml"
 - ".github/release.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/cla.yml"
@@ -42,6 +43,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
 - CODE_OF_CONDUCT.md
@@ -55,6 +57,7 @@ files:
 - bin/rubocop
 - bin/setup
 - config/default.yml
+- config/obsoletion.yml
 - config/rbi.yml
 - dev.yml
 - lib/rubocop-sorbet.rb
@@ -121,14 +124,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.7
 signing_key: 
 specification_version: 4
 summary: Automatic Sorbet code style checking tool.