rubocop-sorbet 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 680171335e42d9f614626c06b286af906fbd4a71473ad36a5133e343ca202376
-  data.tar.gz: c84b1f2a66e5f2406640d5c2543f5a936b61b25141a8136a1cdf94f36f6af2cf
+  metadata.gz: 2dea563faa3843260cff524016317221bae41fe6eaf162b8abed91963c79e1d4
+  data.tar.gz: b45f03fb4a552be371a86fa6d710e53b41536a68c1fea93c5df58396d5aa4fbf
 SHA512:
-  metadata.gz: 6c93471fa6670ce5c257fa7604bf9755bd910baffcfed62348f22dcb9242868ec42c9738f2b507317340085b22ada30140e3ad618408a5563fd00d449d4a8e81
-  data.tar.gz: e105b484e8b8e75177e126e8dd3b682514a4deb4f9135ace3e97ca49d4f9dcd54dc23800676cb48386faabe7a779deca53335f01affdc981351d11647cbed47c
+  metadata.gz: 46021afef2a60b990d7db28dc1b38059e9aa36ba39e3ebcdf9185e35a9c8dbf9181df0303315b515ebcb126ba6fe0a1cc27dc8adcfcd8f4f8377e4679376738d
+  data.tar.gz: 00721e2b73fa61a35707c68ac8bc0466ab2b7e344c8aae200c13a03e7481407d92682ca859567f4ace4f60574a0e996f175a57d6aaf4890a3c87c65d41cb32b2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-sorbet (0.3.4)
+    rubocop-sorbet (0.3.5)
 
 GEM
   remote: https://rubygems.org/

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

@@ -36,7 +36,8 @@ module RuboCop
             return unless extract_sigil(processed_source).nil?
 
             token = processed_source.tokens.first
-            corrector.insert_before(token.pos, "# typed: #{minimum_strictness || suggested_strictness}\n")
+            replace_with = suggested_strictness_level(minimum_strictness, suggested_strictness)
+            corrector.insert_before(token.pos, "# typed: #{replace_with}\n")
           end
         end
 
@@ -64,7 +65,7 @@ module RuboCop
 
           token = processed_source.tokens.first
           if require_sigil_on_all_files?
-            strictness = minimum_strictness || suggested_strictness
+            strictness = suggested_strictness_level(minimum_strictness, suggested_strictness)
             add_offense(
               token,
               location: token.pos,
@@ -75,6 +76,25 @@ module RuboCop
           false
         end
 
+        def suggested_strictness_level(minimum_strictness, suggested_strictness)
+          # if no minimum strictness is set (eg. using Sorbet/HasSigil without config) then
+          # we always use the suggested strictness which defaults to `false`
+          return suggested_strictness unless minimum_strictness
+
+          # special case: if you're using Sorbet/IgnoreSigil without config, we should recommend `ignore`
+          return "ignore" if minimum_strictness == "ignore" && cop_config['SuggestedStrictness'].nil?
+
+          # if a minimum strictness is set (eg. you're using Sorbet/FalseSigil)
+          # we want to compare the minimum strictness and suggested strictness. this is because
+          # the suggested strictness might be higher than the minimum (eg. if you want all new files
+          # at a higher strictness level, without having to migrate existing files at lower levels).
+
+          suggested_level = STRICTNESS_LEVELS.index(suggested_strictness)
+          minimum_level = STRICTNESS_LEVELS.index(minimum_strictness)
+
+          suggested_level > minimum_level ? suggested_strictness : minimum_strictness
+        end
+
         def check_strictness_not_empty(sigil, strictness)
           return true if strictness
 
@@ -122,12 +142,12 @@ module RuboCop
 
         # Default is `'false'`
         def suggested_strictness
-          cop_config['SuggestedStrictness'] || 'false'
+          STRICTNESS_LEVELS.include?(cop_config['SuggestedStrictness']) ? cop_config['SuggestedStrictness'] : 'false'
         end
 
         # Default is `nil`
         def minimum_strictness
-          cop_config['MinimumStrictness']
+          cop_config['MinimumStrictness'] if STRICTNESS_LEVELS.include?(cop_config['MinimumStrictness'])
         end
       end
     end

data/rubocop-sorbet.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'rubocop-sorbet'
-  spec.version       = '0.3.4'
+  spec.version       = '0.3.5'
   spec.authors       = ['Ufuk Kayserilioglu', 'Alan Wu', 'Alexandre Terrasa', 'Peter Zhu']
   spec.email         = ['ruby@shopify.com']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-sorbet
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec