rubocop-sorbet 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b73993245df905cf40d9e0dbc440d613315e5b32d89e9b61ee123994fee53e73
-  data.tar.gz: '019d4212c2c204492aa38f928ddfc31cceac5d79fe6ee09927c889e3b245f999'
+  metadata.gz: d705f397454c9a1658a3fc81f98df969c2ca5d5119924404f9195d3e878d6119
+  data.tar.gz: 62f7e2f18940530a2a757b0c085463b8462edceb8c2f987f4038c3d71ff8fd0e
 SHA512:
-  metadata.gz: d491ed5a48d75c2f5151329fc0018ca56ed57504d6d1e338befe0c9395bf85824b65f68164538667b4720eca216eeb15c29c6ed379524ae9ed1a8215cf6daf84
-  data.tar.gz: 7944aa4817f48ca0bb43c47dabcf197ced656674ab59ce261705b946045a2e3c0de813200187829cf9936a2144a5203ed625c8cdd89a33b7e80876229f7f2748
+  metadata.gz: cf74e543eb073e9db8fd3f38a0914124d06fd8b586eda66da33376486998d94f0c735ad31c3cbc32b4fc6f436a4f1288f9f232e32c1a014389969f7101f58d72
+  data.tar.gz: 4aab7f7d8e47a91ea405042143a04252218b66ec264969a11494d695f66ad1583d9d362d1dfe9c7a15b8084a92ceb00df565345b047265ed8068eadb2abadcca

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-sorbet (0.4.1)
+    rubocop-sorbet (0.5.0)
       rubocop
 
 GEM

data/config/default.yml

@@ -55,13 +55,15 @@ Sorbet/FalseSigil:
 
 Sorbet/ForbidIncludeConstLiteral:
   Description: 'Forbids include of non-literal constants.'
-  Enabled: true
+  Enabled: false
   VersionAdded: 0.2.0
+  VersionChanged: 0.5.0
 
 Sorbet/ForbidSuperclassConstLiteral:
   Description: 'Forbid superclasses which are non-literal constants.'
-  Enabled: true
+  Enabled: false
   VersionAdded: 0.2.0
+  VersionChanged: 0.5.0
 
 Sorbet/ForbidUntypedStructProps:
   Description: >-

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

@@ -14,15 +14,6 @@ require 'rubocop'
 # end
 # ```
 #
-# This cop replaces them by:
-#
-# ```ruby
-# class MyClass
-#   MyClassInclude = send_expr
-#   include MyClassInclude
-# end
-# ```
-#
 # Multiple occurences of this can be found in Shopify's code base like:
 #
 # ```ruby
@@ -61,37 +52,6 @@ module RuboCop
           return unless [:module, :class, :sclass].include?(parent.type)
           add_offense(node)
         end
-
-        def autocorrect(node)
-          lambda do |corrector|
-            # Find parent class node
-            parent = node.parent
-            parent = parent.parent if parent.type == :begin
-
-            # Build include variable name
-            class_name = (parent.child_nodes.first.const_name || 'Anon').split('::').last
-            include_name = find_free_name("#{class_name}Include")
-            used_names << include_name
-
-            # Apply fix
-            indent = ' ' * node.loc.column
-            fix = "#{include_name} = #{node.child_nodes.first.source}\n#{indent}"
-            corrector.insert_before(node.loc.expression, fix)
-            corrector.replace(node.child_nodes.first.loc.expression, include_name)
-          end
-        end
-
-        # Find a free local variable name
-        #
-        # Since each include uses its own local variable to store the send result,
-        # we need to ensure that we don't use the same name twice in the same
-        # module.
-        def find_free_name(base_name)
-          return base_name unless used_names.include?(base_name)
-          i = 2
-          i += 1 while used_names.include?("#{base_name}#{i}")
-          "#{base_name}#{i}"
-        end
       end
     end
   end

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

@@ -12,13 +12,6 @@ require 'rubocop'
 # class Foo < send_expr; end
 # ```
 #
-# This cop replaces them by:
-#
-# ```ruby
-# FooParent = send_expr
-# class Foo < FooParent; end
-# ```
-#
 # Multiple occurences of this can be found in Shopify's code base like:
 #
 # ```ruby
@@ -46,16 +39,6 @@ module RuboCop
           return unless not_lit_const_superclass?(node)
           add_offense(node.child_nodes[1])
         end
-
-        def autocorrect(node)
-          lambda do |corrector|
-            class_name = node.parent.child_nodes.first.const_name
-            parent_name = "#{class_name}Parent"
-            indent = ' ' * node.parent.loc.column
-            corrector.insert_before(node.parent.loc.expression, "#{parent_name} = #{node.source}\n#{indent}")
-            corrector.replace(node.loc.expression, parent_name)
-          end
-        end
       end
     end
   end

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

@@ -28,6 +28,8 @@ module RuboCop
       # Only `typed`, `(en)?coding`, `warn_indent` and `frozen_string_literal` magic comments are considered,
       # other comments or magic comments are left in the same place.
       class EnforceSigilOrder < ValidSigil
+        include RangeHelp
+
         def investigate(processed_source)
           return if processed_source.tokens.empty?
 
@@ -49,6 +51,14 @@ module RuboCop
             tokens.each_with_index do |token, index|
               corrector.replace(token.pos, expected[index].text)
             end
+
+            # Remove blank lines between the magic comments
+            lines = tokens.map(&:line).to_set
+            (lines.min...lines.max).each do |line|
+              next if lines.include?(line)
+              next unless processed_source[line - 1].empty?
+              corrector.remove(source_range(processed_source.buffer, line, 0))
+            end
           end
         end
 

data/lib/rubocop/sorbet/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module RuboCop
   module Sorbet
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

data/manual/cops_sorbet.md

@@ -175,7 +175,7 @@ Exclude | `bin/**/*`, `db/**/*.rb`, `script/**/*` | Array
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
 --- | --- | --- | --- | ---
-Enabled | Yes | Yes  | 0.2.0 | -
+Disabled | Yes | No  | 0.2.0 | 0.5.0
 
 No documentation
 
@@ -183,7 +183,7 @@ No documentation
 
 Enabled by default | Safe | Supports autocorrection | VersionAdded | VersionChanged
 --- | --- | --- | --- | ---
-Enabled | Yes | Yes  | 0.2.0 | -
+Disabled | Yes | No  | 0.2.0 | 0.5.0
 
 No documentation
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-sorbet
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec