typeprof 0.21.6 → 0.21.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d207fe000797f7326bd569640296801ff8047d8261b2461f22c744899753641
-  data.tar.gz: ec87c3c228fc1326739f11fc6aaa63c4d5db46ad66bec55aab46d11d09953a50
+  metadata.gz: 71c74382cb8602ed9c902218ec5066d20865cc8040e5af6737e8d8a0d19beca9
+  data.tar.gz: 2646a63cd334443a8dc716f99a5828fac960afdf80f8a0f8c8b5f289e6fb957d
 SHA512:
-  metadata.gz: b6acf621b74c3468b14986c8c8616d0d6fc30a4e610dcf817ef550cc302d008cf916ea34f721a7e06038b48c77097e83a16f2e27233e93b18465f69288da4561
-  data.tar.gz: 1c80d8d54c9cda86819eac0aec7b47393f01423a6506946240ebdef40b02ad90bae4c69c43ced7906ecc60945b85fee2baefc8c0aa717a8b95c570f9c25adcf4
+  metadata.gz: 9c0ca22252a4804152efafafb63c9c8d1d1fb2e796a9d17251f1634dc1393c7fcaac7f924d4a341a0699c5113c3fea8bb03714ceb287ded60bc7057cac7a640c
+  data.tar.gz: 899c481fc8a4a05787ab0e66064220b33b17f8f1f0f045b9a1d05d4ebdae1ea4cd62cfe552342588b5a2834491638303be5a2e05c4b00d99713fe4693a6c557a

data/.github/workflows/main.yml

@@ -13,7 +13,7 @@ jobs:
     uses: ruby/actions/.github/workflows/ruby_versions.yml@master
     with:
       engine: cruby-truffleruby
-      min_version: 2.7
+      min_version: 3.0
 
   build:
     needs: ruby-versions

data/.gitignore

@@ -2,7 +2,6 @@ coverage.dump
 coverage.info
 coverage/
 stackprof*.dump
-testbed/goodcheck
 testbed/diff-lcs
 pkg/
 *.log

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    typeprof (0.21.6)
+    typeprof (0.21.8)
       rbs (>= 1.8.1)
 
 GEM
@@ -11,7 +11,7 @@ GEM
     docile (1.4.0)
     power_assert (2.0.1)
     rake (13.0.1)
-    rbs (3.0.1)
+    rbs (3.2.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)

data/lib/typeprof/analyzer.rb

@@ -2231,6 +2231,34 @@ module TypeProf
       merge_env(ep.next, env)
     end
 
+    private def ruby_3_3_keywords?
+      @ruby_3_3_keywords ||=
+        RubyVM::InstructionSequence.compile("foo(*a, **b)").to_a.last[-2][1][:orig_argc] == 2
+    end
+
+    private def type_to_keywords(ty, ep)
+      case ty
+      when Type::Hash
+        ty.elems.to_keywords
+      when Type::Union
+        hash_elems = nil
+        ty.elems&.each do |(container_kind, base_type), elems|
+          if container_kind == Type::Hash
+            elems.to_keywords
+            hash_elems = hash_elems ? hash_elems.union(elems) : elems
+          end
+        end
+        if hash_elems
+          hash_elems.to_keywords
+        else
+          { nil => Type.any }
+        end
+      else
+        warn(ep, "non hash is passed to **kwarg?") unless ty == Type.any
+        { nil => Type.any }
+      end
+    end
+
     private def setup_actual_arguments(kind, operands, ep, env)
       opt, blk_iseq = operands
       flags = opt[:flag]
@@ -2245,7 +2273,7 @@ module TypeProf
       _flag_args_fcall   = flags[ 2] != 0
       _flag_args_vcall   = flags[ 3] != 0
       _flag_args_simple  = flags[ 4] != 0 # unused in TP
-      _flag_blockiseq    = flags[ 5] != 0 # unused in VM :-)
+      flags <<= 1 if RUBY_VERSION >= "3.3" # blockiseq flag was removed in 3.3
       flag_args_kwarg    = flags[ 6] != 0
       flag_args_kw_splat = flags[ 7] != 0
       _flag_tailcall     = flags[ 8] != 0
@@ -2284,42 +2312,33 @@ module TypeProf
       blk_ty = new_blk_ty
 
       if flag_args_splat
-        # assert !flag_args_kwarg
-        rest_ty = aargs.last
-        aargs = aargs[0..-2]
-        if flag_args_kw_splat
-          # XXX: The types contained in ActualArguments are expected to be all local types.
-          # This "globalize_type" breaks the invariant, and violates the assertion of Union#globalize that asserts @elems be nil.
-          # To fix this issue fundamentally, ActualArguments should keep all arguments as-is (as like the VM does),
-          # and globalize some types on the on-demand bases.
-          ty = globalize_type(rest_ty, env, ep)
-          if ty.is_a?(Type::Array)
-            _, (ty,) = ty.elems.take_last(1)
-            case ty
-            when Type::Hash
-              kw_tys = ty.elems.to_keywords
-            when Type::Union
-              hash_elems = nil
-              ty.elems&.each do |(container_kind, base_type), elems|
-                if container_kind == Type::Hash
-                  elems.to_keywords
-                  hash_elems = hash_elems ? hash_elems.union(elems) : elems
-                end
-              end
-              if hash_elems
-                kw_tys = hash_elems.to_keywords
-              else
-                kw_tys = { nil => Type.any }
-              end
+        if ruby_3_3_keywords?
+          if flag_args_kw_splat
+            kw_tys = type_to_keywords(globalize_type(aargs[-1], env, ep), ep)
+            aargs = aargs[0..-2]
+          else
+            kw_tys = {}
+          end
+          rest_ty = aargs.last
+          aargs = aargs[0..-2]
+        else
+          rest_ty = aargs.last
+          aargs = aargs[0..-2]
+          if flag_args_kw_splat
+            # XXX: The types contained in ActualArguments are expected to be all local types.
+            # This "globalize_type" breaks the invariant, and violates the assertion of Union#globalize that asserts @elems be nil.
+            # To fix this issue fundamentally, ActualArguments should keep all arguments as-is (as like the VM does),
+            # and globalize some types on the on-demand bases.
+            ty = globalize_type(rest_ty, env, ep)
+            if ty.is_a?(Type::Array)
+              _, (ty,) = ty.elems.take_last(1)
+              kw_tys = type_to_keywords(ty, ep)
             else
-              warn(ep, "non hash is passed to **kwarg?") unless ty == Type.any
-              kw_tys = { nil => Type.any }
+              raise NotImplementedError
             end
           else
-            raise NotImplementedError
+            kw_tys = {}
           end
-        else
-          kw_tys = {}
         end
         aargs = ActualArguments.new(aargs, rest_ty, kw_tys, blk_ty)
       elsif flag_args_kw_splat

data/lib/typeprof/cli.rb

@@ -23,7 +23,8 @@ module TypeProf
       gem_rbs_features = []
       show_version = false
       max_sec = max_iter = nil
-      collection_path = RBS::Collection::Config::PATH
+      collection_path = nil
+      no_collection = false
 
       load_path_ext = []
 
@@ -35,8 +36,8 @@ module TypeProf
       opt.on("--version", "Display typeprof version") { show_version = true }
       opt.on("-I DIR", "Add DIR to the load/require path") {|v| load_path_ext << v }
       opt.on("-r FEATURE", "Require RBS of the FEATURE gem") {|v| gem_rbs_features << v }
-      opt.on("--collection PATH", "File path of collection configuration") { |v| collection_path = v }
-      opt.on("--no-collection", "Ignore collection configuration") { collection_path = nil }
+      opt.on("--collection PATH", "File path of collection configuration") { |v| collection_path = Pathname(v) }
+      opt.on("--no-collection", "Ignore collection configuration") { no_collection = true }
       opt.on("--lsp", "LSP mode") {|v| options[:lsp] = true }
 
       opt.separator ""
@@ -104,6 +105,14 @@ module TypeProf
         raise OptionParser::InvalidOption.new("lsp options with non-lsp mode")
       end
 
+      if !no_collection && collection_path && !collection_path.exist?
+        exit if show_version
+        raise OptionParser::InvalidOption.new("collection path not found (#{collection_path})")
+      end
+
+      collection_path ||= RBS::Collection::Config::PATH
+      collection_path = nil if no_collection
+
       ConfigData.new(
         rb_files: rb_files,
         rbs_files: rbs_files,
@@ -118,9 +127,9 @@ module TypeProf
         lsp_options: lsp_options,
       )
 
-    rescue OptionParser::InvalidOption
+    rescue OptionParser::InvalidOption, OptionParser::MissingArgument
       puts $!
-      exit
+      exit 1
     end
   end
 end

data/lib/typeprof/import.rb

@@ -31,7 +31,7 @@ module TypeProf
           lock_path = RBS::Collection::Config.to_lockfile_path(collection_path)
           if lock_path.exist?
             collection_lock = RBS::Collection::Config::Lockfile.from_lockfile(lockfile_path: lock_path, data: YAML.load_file(lock_path.to_s))
-            collection_lock.gems.each {|gem| @loaded_gems << gem["name"] }
+            collection_lock.gems.each_value {|gem| @loaded_gems << gem[:name] }
             loader.add_collection(collection_lock)
           else
             raise "Please execute 'rbs collection install'"

data/lib/typeprof/lsp.rb

@@ -352,6 +352,7 @@ module TypeProf
           }
         end
 
+        @server.send_notification('typeprof.enableToggleButton')
         @server.send_request("workspace/codeLens/refresh")
 
         @server.send_notification(
@@ -827,6 +828,13 @@ module TypeProf
       end
     end
 
+    module MessageType
+      Error = 1
+      Warning = 2
+      Info = 3
+      Log = 4
+    end
+
     class Server
       class Exit < StandardError; end
 
@@ -861,6 +869,20 @@ module TypeProf
           end
         end
       rescue Exit
+      rescue => e
+        msg = "Tyeprof fatal error: #{e.message}"
+        send_notification(
+          'window/showMessage',
+          type: MessageType::Error,
+          message: msg
+        )
+        send_notification(
+          'window/logMessage',
+          type: MessageType::Error,
+          message: "#{msg} Backtrace: #{e.backtrace}"
+        )
+        send_notification('typeprof.showErrorStatus')
+        retry
       end
 
       def send_response(**msg)

data/lib/typeprof/method.rb

@@ -117,6 +117,12 @@ module TypeProf
         ty = Type::Array.new(Type::Array::Elements.new([], msig.rest_ty), Type::Instance.new(Type::Builtin[:ary]))
         ty = ty.substitute(cur_subst, Config.current.options[:type_depth_limit]).remove_type_vars
         nenv, rest_ty = scratch.localize_type(ty, nenv, callee_ep, alloc_site2)
+        # TODO: handle a case where rest_start is not found
+        nenv = nenv.local_update(rest_start, rest_ty)
+      elsif rest_start
+        alloc_site2 = alloc_site.add_id(idx += 1)
+        ty = Type::Array.new(Type::Array::Elements.new([], Type.any), Type::Instance.new(Type::Builtin[:ary]))
+        nenv, rest_ty = scratch.localize_type(ty, nenv, callee_ep, alloc_site2)
         nenv = nenv.local_update(rest_start, rest_ty)
       end
       if msig.post_tys
@@ -146,6 +152,11 @@ module TypeProf
         ty = ty.substitute(cur_subst, Config.current.options[:type_depth_limit]).remove_type_vars
         nenv, ty = scratch.localize_type(ty, nenv, callee_ep, alloc_site2)
         nenv = nenv.local_update(kw_rest, ty)
+      elsif kw_rest
+        alloc_site2 = alloc_site.add_id(:**)
+        ty = Type.gen_hash {}
+        nenv, ty = scratch.localize_type(ty, nenv, callee_ep, alloc_site2)
+        nenv = nenv.local_update(kw_rest, ty)
       end
       nenv = nenv.local_update(block_start, msig.blk_ty) if block_start
 

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.21.6"
+  VERSION = "0.21.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.21.6
+  version: 0.21.8
 platform: ruby
 authors:
 - Yusuke Endoh
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -74,7 +74,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/typeprof
   source_code_uri: https://github.com/ruby/typeprof
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.0.dev
-signing_key: 
+signing_key:
 specification_version: 4
 summary: TypeProf is a type analysis tool for Ruby code based on abstract interpretation
 test_files: []