repl_type_completor 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e17428782dfde53e8b592d0fb16957c02ec537bee5122a624e3a99bbfc663e5a
-  data.tar.gz: ebebeec739da4ae0e46ac690f3e238cff6759a3cedebccdf9e180e28ee6c51a8
+  metadata.gz: 63dda3c224b0b6eeb8dbc32ef8d3890878eb6f5134d3c5651406f321ade32e00
+  data.tar.gz: a4e24e9d56dc4802fc826693e0866185a63e5e027ad4b7e0fb9b819c35a83ba4
 SHA512:
-  metadata.gz: d2d803e3ae97d53a1b3287b564615f9f4f9790d58065ad224d9376ec4fd2407d6df66d10c20a54175ad10c57e2b9efafe10955e01306b21c0d92213b6cc5b9e9
-  data.tar.gz: 4ffb182ae4720b9e67d4abb575c09b1e07f7c00a33c1c2601bf66f763eaa4997f8a813980b9367f47ba9731f6ce318a13b277d8c80396c9e7cfe43178896198c
+  metadata.gz: 25324bc6b23711cd04dec7c6956436e2b9ebc58a54c1583135c9056d0d8165a9fe3b227e0312a905c953ac12f726a5b71e9e219b9910e3e0ad025b2e97ff1464
+  data.tar.gz: b502763947570ec6362381d29740f11213839bc1472c3f8f22929b5580f3f65dd1ef994e328fc4d73cf46b1be6d6b6ab6052f69ea6719f50e347b21f78db6d1e

data/Gemfile

@@ -23,5 +23,6 @@ if ENV['GEMFILE_RBS_VERSION']
     gem 'rbs', github: 'ruby/rbs'
   else
     gem 'rbs', ENV['GEMFILE_RBS_VERSION']
+    gem 'logger' # ruby >= 4.0 && rbs <= 3.5
   end
 end

data/lib/repl_type_completor/result.rb

@@ -65,6 +65,19 @@ module ReplTypeCompletor
         scope.global_variables
       in [:symbol, name]
         filter_symbol_candidates(Symbol.all_symbols, name, limit: 100)
+      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
+        end.flat_map do |t|
+          t.instances.flat_map(&:keys).grep(key_type).uniq.sort
+        end
+        if key_type == Symbol
+          keys = Symbol.all_symbols if keys.empty? && name.size >= 1
+          filter_symbol_candidates(keys, name, limit: 100)
+        else
+          keys.select { _1.start_with?(name) }.sort
+        end
       in [:call, name, type, self_call]
         (self_call ? type.all_methods : type.methods).map(&:to_s) - HIDDEN_METHODS
       in [:lvar_or_method, name, scope]

data/lib/repl_type_completor/version.rb

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

data/lib/repl_type_completor.rb

@@ -59,6 +59,15 @@ module ReplTypeCompletor
 
     private
 
+    # Checks if `*parents, target_node` returned by `find_target` is a call with a single argument.
+    # returns CallNode or nil.
+    def single_arg_call_node(parents)
+      call_node, args_node = parents.last(2)
+      if call_node.is_a?(Prism::CallNode) && args_node.is_a?(Prism::ArgumentsNode) && args_node.arguments.size == 1
+        call_node
+      end
+    end
+
     def analyze_code(code, binding = Object::TOPLEVEL_BINDING)
       ast = Prism.parse(code, scopes: [binding.local_variables]).value
       *parents, target_node = find_target ast, code.bytesize
@@ -69,14 +78,14 @@ module ReplTypeCompletor
 
       case target_node
       when Prism::StringNode
-        return unless target_node.closing&.empty?
-
-        call_node, args_node = parents.last(2)
-        return unless call_node.is_a?(Prism::CallNode) && call_node.receiver.nil?
-        return unless args_node.is_a?(Prism::ArgumentsNode) && args_node.arguments.size == 1
+        return if target_node.opening == "?" || (target_node.closing_loc && !target_node.closing.empty?)
 
-        if call_node.name == :require || call_node.name == :require_relative
+        call_node = single_arg_call_node(parents) # require("target") or require_relative("target")
+        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"]
+          receiver_type, _scope = calculate_type_scope.call call_node.receiver
+          [:aref, :string, target_node.content, receiver_type]
         end
       when Prism::SymbolNode
         return unless !target_node.closing || target_node.closing.empty?
@@ -85,6 +94,9 @@ module ReplTypeCompletor
         if parents.last.is_a? Prism::BlockArgumentNode # method(&:target)
           receiver_type, _scope = calculate_type_scope.call target_node
           [:call, name, receiver_type, false]
+        elsif (call_node = single_arg_call_node(parents)) && call_node.receiver && call_node.name == :[] # object[:target]
+          receiver_type, _scope = calculate_type_scope.call call_node.receiver
+          [:aref, :symbol, name, receiver_type]
         else
           [:symbol, name] unless name.empty?
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: repl_type_completor
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - tompng
@@ -30,9 +30,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -40,9 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 description: Type based completion for REPL.
 email:
 - tomoyapenguin@gmail.com