solargraph 0.47.1 → 0.47.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d697adb07ecb0f68c08da0001decead501d9c755bf79b3870c0e3f67c062d6c
-  data.tar.gz: 191141aee5b75aa20a514bbc807df5c058823094afa99d9948bada9067c3eb8b
+  metadata.gz: 9d35030ae56f6aaff108a24e4fb06713f911ba4366feb2223b24ad0ea4568522
+  data.tar.gz: a9eeaee16171bc762922ac55d10c61d53bcfe6ef1df0b20623c81e0978a80c7d
 SHA512:
-  metadata.gz: fa47406469782b55edc3f75d6a4474d6730153333a40ac76092ca0586a7935f9ad36b44dfb641df35b48317c0e5fffb6d722dbe0df88833130da534c33ae80b6
-  data.tar.gz: 5fb3c3e20abaa8b90375213601ec354ef936bfb7cc2f49fba44f6af3254e864ae38beaf6668186931a33fcd72d587fe5a29a67122cb3a65b2d85dd6deba6c147
+  metadata.gz: 0b13ae6284def50f72c9aaed3cad6f89e879306dc8421b1c13f622e18181e6d9aaecf4f57ffa56601a00c92066557bb798d3e8ee6a397920ff0072f909e05463
+  data.tar.gz: 9a0366309ebe9a4a784c2933a8452e2084c376ff9aa3cd6c3bf555f4d6ce046f11245679c688bef43c6c1e67d94b70afb4250149c9b01b80fc525b80a80b6486

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.47.2 - September 30, 2022
+- Fix complex type inference (#578)
+- Off-by-one diagnostic (#595)
+
 ## 0.47.1 - September 27, 2022
 - Remove debug code from release (#600)
 

data/lib/solargraph/complex_type.rb

@@ -74,6 +74,10 @@ module Solargraph
       @items.all? &block
     end
 
+    def any? &block
+      @items.any? &block
+    end
+
     def selfy?
       @items.any?(&:selfy?)
     end

data/lib/solargraph/diagnostics/rubocop.rb

@@ -89,7 +89,7 @@ module Solargraph
           Position.new(off['location']['start_line'], 0)
         else
           Position.new(
-            off['location']['start_line'] - 1, off['location']['last_column']
+            off['location']['start_line'] - 1, off['location']['last_column'] - 1
           )
         end
       end

data/lib/solargraph/type_checker/checks.rb

@@ -61,6 +61,19 @@ module Solargraph
         false
       end
 
+      # @param api_map [ApiMap]
+      # @param inferred [ComplexType]
+      # @param expected [ComplexType]
+      # @return [Boolean]
+      def all_types_match? api_map, inferred, expected
+        return duck_types_match?(api_map, expected, inferred) if expected.duck_type?
+        inferred.each do |inf|
+          next if inf.duck_type?
+          return false unless expected.any? { |exp| exp == inf || either_way?(api_map, inf, exp) }
+        end
+        true
+      end
+
       # @param api_map [ApiMap]
       # @param expected [ComplexType]
       # @param inferred [ComplexType]

data/lib/solargraph/type_checker.rb

@@ -105,7 +105,7 @@ module Solargraph
               result.push Problem.new(pin.location, "#{pin.path} return type could not be inferred", pin: pin)
             end
           else
-            unless (rules.rank > 1 ? types_match?(api_map, declared, inferred) : any_types_match?(api_map, declared, inferred))
+            unless (rules.rank > 1 ? all_types_match?(api_map, inferred, declared) : any_types_match?(api_map, declared, inferred))
               result.push Problem.new(pin.location, "Declared return type #{declared} does not match inferred type #{inferred} for #{pin.path}", pin: pin)
             end
           end
@@ -177,7 +177,7 @@ module Solargraph
                   result.push Problem.new(pin.location, "Variable type could not be inferred for #{pin.name}", pin: pin)
                 end
               else
-                unless (rules.rank > 1 ? types_match?(api_map, declared, inferred) : any_types_match?(api_map, declared, inferred))
+                unless any_types_match?(api_map, declared, inferred)
                   result.push Problem.new(pin.location, "Declared type #{declared} does not match inferred type #{inferred} for variable #{pin.name}", pin: pin)
                 end
               end

data/lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.47.1'
+  VERSION = '0.47.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph
 version: !ruby/object:Gem::Version
-  version: 0.47.1
+  version: 0.47.2
 platform: ruby
 authors:
 - Fred Snyder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backport