repl_type_completor 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7396517907163fafe31927aecac03274cbfaeea45a76105d8e44fadccba7ea98
-  data.tar.gz: 4c7e2f53c8cc769b955183a43a6be74ff56c3edd69362a5291340544979d12bc
+  metadata.gz: 2dce7fd408fd473356245c6b83f8ba3240ebe39946a7e9a929cbfdde6cd138a1
+  data.tar.gz: 78002d089560ede6af424b70a46f10f0b65218858bdf6dee8ec63c07bf7b2b45
 SHA512:
-  metadata.gz: 21c015fd50e3c0e35d62a8d60b055e38590c28811e69921940be67c26abe3c5d2b2ba1ab5b85ac45bffedfc1bb58f1ff1d76a38d14853b0b6d7c19718d4d327f
-  data.tar.gz: 24e8a55efc092fa2906fb5d0c2258c8b0ef403e53ac55c018429555533ff2842696f0edc1b7bb1f41f0a4739a7a5a2112e897b58ac9e9a7093c7a46e6980ec01
+  metadata.gz: 3347f5df32b086a04a916d4e1b8def4352c392cc1a59564e2e87eceda50c4e50933117a8c9c72ca0e92d004a77f312d16d02a2923082de2df3babdc60e545426
+  data.tar.gz: 1c0916a0129ec721e14c20c166290f41db39a97f832b32dde332cef8140a3c47723ebef94cff4623d1e2738c3174070cfac462d5db88a4f4b9b7932213241919

data/lib/repl_type_completor/result.rb

@@ -68,7 +68,7 @@ module ReplTypeCompletor
       in [:aref, key_type, name, receiver_type]
         key_type = key_type == :string ? String : Symbol
         keys = receiver_type.types.grep(Types::InstanceType).select do |t|
-          Hash == t.klass
+          Hash == t.klass && t.instances
         end.flat_map do |t|
           t.instances.flat_map(&:keys).grep(key_type).uniq
         end

data/lib/repl_type_completor/type_analyzer.rb

@@ -3,9 +3,17 @@
 require 'set'
 require_relative 'types'
 require_relative 'scope'
-require 'prism'
-
 module ReplTypeCompletor
+  # Prefer Ruby::Prism, the parser built into the interpreter (Ruby 4.1+),
+  # over the prism gem. Every reference to Prism in this gem is lexically
+  # inside the ReplTypeCompletor module, so it resolves to this constant.
+  if defined?(Ruby::Prism)
+    Prism = Ruby::Prism
+  else
+    require 'prism'
+    Prism = ::Prism
+  end
+
   class TypeAnalyzer
     class DigTarget
       def initialize(parents, receiver, &block)

data/lib/repl_type_completor/types.rb

@@ -37,6 +37,10 @@ module ReplTypeCompletor
           gem_sig_path = File.expand_path("#{spec.gem_dir}/sig")
           loader.add(library: spec.name, version: spec.version) if Dir.exist?(gem_sig_path) && expanded_sig_path != gem_sig_path
         end
+        # A gem's sig/manifest.yaml can declare dependencies on stdlib libraries that
+        # the installed RBS version does not ship (e.g. prism >= 2.0 depends on pp,
+        # which was added in RBS 3.3). Skip those instead of failing to load everything.
+        loader.libs.delete_if { |lib| !loader.has_library?(library: lib.name, version: lib.version) }
       end
 
       # Hack to make this thread priority lower, not to block the main thread.

data/lib/repl_type_completor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReplTypeCompletor
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

data/lib/repl_type_completor.rb

@@ -45,7 +45,7 @@ module ReplTypeCompletor
 
     def info
       require 'rbs'
-      prism_info = "Prism: #{Prism::VERSION}"
+      prism_info = "#{Prism}: #{Prism::VERSION}"
       rbs_info = "RBS: #{RBS::VERSION}"
       if rbs_load_error
         rbs_info << " #{rbs_load_error.inspect}"
@@ -69,7 +69,7 @@ module ReplTypeCompletor
     end
 
     def analyze_code(code, binding = Object::TOPLEVEL_BINDING)
-      ast = Prism.parse(code, scopes: [binding.local_variables]).value
+      ast = Prism.parse(code, scopes: [binding.local_variables], **prism_parse_options).value
       *parents, target_node = find_target ast, code.bytesize
       return unless target_node
 
@@ -81,6 +81,8 @@ module ReplTypeCompletor
         return if target_node.opening == "?" || (target_node.closing_loc && !target_node.closing.empty?)
 
         call_node = single_arg_call_node(parents) # require("target") or require_relative("target")
+        return unless call_node
+
         if call_node.receiver.nil? && (call_node.name == :require || call_node.name == :require_relative)
           [call_node.name, target_node.content]
         elsif call_node.receiver && call_node.name == :[] # object["target"]
@@ -135,6 +137,18 @@ module ReplTypeCompletor
       end
     end
 
+    # Parse with the syntax of the running Ruby so that completion matches what will be executed.
+    # Fall back to Prism's default when `version: "current"` is not available (Prism < 1.6)
+    # or the running Ruby version is unknown to the installed Prism (Ruby < 3.3, or a newer Ruby).
+    def prism_parse_options
+      @prism_parse_options ||= begin
+        Prism.parse('', version: 'current')
+        { version: 'current' }.freeze
+      rescue ArgumentError # includes Prism::CurrentVersionError
+        {}.freeze
+      end
+    end
+
     def find_target(node, position)
       # Skip because location of these nodes gives location of whole block
       return if node.is_a?(Prism::NumberedParametersNode) || node.is_a?(Prism::ItParametersNode)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repl_type_completor
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - tompng
@@ -13,14 +13,14 @@ dependencies:
   name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency