typeprof 0.21.7 → 0.21.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6586977939af7be53d8c86c57f992569abffac1f011e7a435ea248835fabb5be
-  data.tar.gz: fec9babce50e7c23b31d053a137d7b16c9481ab51bc694d5ba1bf9fd720f63e2
+  metadata.gz: 4f679437d629955ec31b3467826bd4114be2b02786bd31b15736681e52d8d01a
+  data.tar.gz: 8bd7c6403e4c7254e2de29a6d7515bd134996967266a138e2b11ca0834d604c3
 SHA512:
-  metadata.gz: b49afd59c81f251f6526f4f297773983cad6e4ead9ffeff659d1257a5c0138f2b3f8016197fc5537b5bf1a53bebb1382bf3385ce377441a9bbff0f5852e0ac07
-  data.tar.gz: 3603cff083f9db951648cbc8069c017a42057eb6242963879634f7a0e64633632cb21e4bb51988f4a7d99e30de61e670e953409b64b6cc6bac5bbd771049666c
+  metadata.gz: 2ea5197a66f4672a7804b6994d9613b09c55c000024aa78231a29cf6f531e398e507dc50b3fa0ac51f99ca1c64a6b259eee853421209fcc1034748d06f64c6b0
+  data.tar.gz: a334eafef1cb1a808066f2e11862d6af634d38f5360b100699e30d19551213fd8d2b5763f4fd31c3a32273441e1753f15fbb956b7f00856745f678f024f93f70

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
@@ -24,7 +24,7 @@ jobs:
         ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

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.7)
+    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.2)
+    rbs (3.2.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)

data/lib/typeprof/analyzer.rb

@@ -2273,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

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/type.rb

@@ -734,14 +734,19 @@ module TypeProf
 
       def []=(k_ty, v_ty)
         k_ty.each_child_global do |k_ty|
-          # This is a temporal hack to mitigate type explosion
-          k_ty = Type.any if k_ty.is_a?(Type::Array)
-          k_ty = Type.any if k_ty.is_a?(Type::Hash)
-
-          if @map_tys[k_ty]
-            @map_tys[k_ty] = @map_tys[k_ty].union(v_ty)
+          if k_ty.is_a?(Type::Union)
+            # Flatten recursive union
+            self[k_ty] = v_ty
           else
-            @map_tys[k_ty] = v_ty
+            # This is a temporal hack to mitigate type explosion
+            k_ty = Type.any if k_ty.is_a?(Type::Array)
+            k_ty = Type.any if k_ty.is_a?(Type::Hash)
+
+            if @map_tys[k_ty]
+              @map_tys[k_ty] = @map_tys[k_ty].union(v_ty)
+            else
+              @map_tys[k_ty] = v_ty
+            end
           end
         end
       end

data/lib/typeprof/version.rb

@@ -1,3 +1,3 @@
 module TypeProf
-  VERSION = "0.21.7"
+  VERSION = "0.21.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typeprof
 version: !ruby/object:Gem::Version
-  version: 0.21.7
+  version: 0.21.9
 platform: ruby
 authors:
 - Yusuke Endoh
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
+rubygems_version: 3.5.1
 signing_key:
 specification_version: 4
 summary: TypeProf is a type analysis tool for Ruby code based on abstract interpretation