katakata_irb 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 297457c829dac09ddee68c1cc5365acfcc2583e0282fb1070ebae8fa138523ba
-  data.tar.gz: a45663afa386d4093814a3ea2a49c98cb03e90004e2a42c0dc723f4686500a51
+  metadata.gz: 810109ee76180f61c9b3672a8def67d0a32d53ca23b2436c65575457b586bf68
+  data.tar.gz: e17ff5c4e226d785031f2b433b35a8763a49e6a254420fcacf96507975dfa70b
 SHA512:
-  metadata.gz: e66cd04bba34272f585adb1a6dde686a49d064604a48b1c0d14093474857b30537f6b05dd965eaf7ae822b174e373122479c05a643cc951fe4ecea3009a625c6
-  data.tar.gz: 4cb475b48b8e73db73340a1a11c97b087f99d2d6159e235d93a8845e4a718e9b18deb4e693d86059ba98bdbecbf41f24c13cb70d969fdd6d18f9cb171c76478b
+  metadata.gz: 47f0ea76bdf5a5599d219524346acca935b67d1ea73ed60d55887534bce442fffc8c483590b53cd84754c754b829551d837c38687282c497f2924c3ec616f0ff
+  data.tar.gz: f3aec83bbee8f2e889fdcf31eecc85627972511bf1673894d7f45f8a6834e6b52212ec4beb1814e0e8ddd705cf39eb9370ba78ff395d288caadcaa07008ebed8

data/lib/katakata_irb/completor.rb

@@ -12,6 +12,7 @@ module KatakataIrb::Completor
   def self.setup
     KatakataIrb::Types.preload_in_thread
     completion_proc = ->(target, preposing = nil, postposing = nil) do
+      verbose, $VERBOSE = $VERBOSE, nil
       code = "#{preposing}#{target}"
       irb_context = IRB.conf[:MAIN_CONTEXT]
       binding = irb_context.workspace.binding
@@ -19,10 +20,17 @@ module KatakataIrb::Completor
       KatakataIrb::Completor.prev_analyze_result = result
       candidates = case result
       in [:require | :require_relative => method, name]
-        if method == :require
-          IRB::InputCompletor.retrieve_files_to_require_from_load_path
+        if IRB.const_defined? :InputCompletor # IRB::VERSION <= 1.8.1
+          path_completor = IRB::InputCompletor
+        elsif IRB.const_defined? :RegexpCompletor # IRB::VERSION >= 1.8.2
+          path_completor = IRB::RegexpCompletor.new
+        end
+        if !path_completor
+          []
+        elsif method == :require
+          path_completor.retrieve_files_to_require_from_load_path
         else
-          IRB::InputCompletor.retrieve_files_to_require_relative_from_current_dir
+          path_completor.retrieve_files_to_require_relative_from_current_dir
         end
       in [:call_or_const, type, name, self_call]
         ((self_call ? type.all_methods: type.methods).map(&:to_s) - HIDDEN_METHODS) | type.constants
@@ -51,53 +59,75 @@ module KatakataIrb::Completor
       candidates.map(&:to_s).select { !_1.match?(all_symbols_pattern) && _1.start_with?(name) }.uniq.sort.map do
         target + _1[name.size..]
       end
-    end
-    IRB::InputCompletor::CompletionProc.define_singleton_method :call do |*args|
-      completion_proc.call(*args)
     rescue => e
       KatakataIrb.last_completion_error = e
       KatakataIrb.log_puts
       KatakataIrb.log_puts "#{e.inspect} stored to KatakataIrb.last_completion_error"
       KatakataIrb.log_puts
+    ensure
+      $VERBOSE = verbose
     end
 
-    IRB::InputCompletor.singleton_class.prepend Module.new{
-      def retrieve_completion_data(input, doc_namespace: false, **)
-        return super unless doc_namespace
-        name = input[/[a-zA-Z_0-9]+[!?=]?\z/]
-        method_doc = -> type do
-          type = type.types.find { _1.all_methods.include? name.to_sym }
-          if type in KatakataIrb::Types::SingletonType
-            "#{KatakataIrb::Types.class_name_of(type.module_or_class)}.#{name}"
-          elsif type in KatakataIrb::Types::InstanceType
-            "#{KatakataIrb::Types.class_name_of(type.klass)}##{name}"
-          end
+    doc_namespace_proc = ->(input) do
+      name = input[/[a-zA-Z_0-9]+[!?=]?\z/]
+      method_doc = -> type do
+        type = type.types.find { _1.all_methods.include? name.to_sym }
+        if type in KatakataIrb::Types::SingletonType
+          "#{KatakataIrb::Types.class_name_of(type.module_or_class)}.#{name}"
+        elsif type in KatakataIrb::Types::InstanceType
+          "#{KatakataIrb::Types.class_name_of(type.klass)}##{name}"
         end
-        call_or_const_doc = -> type do
-          if name =~ /\A[A-Z]/
-            type = type.types.grep(KatakataIrb::Types::SingletonType).find { _1.module_or_class.const_defined?(name) }
-            type.module_or_class == Object ? name : "#{KatakataIrb::Types.class_name_of(type.module_or_class)}::#{name}" if type
-          else
-            method_doc.call(type)
-          end
+      end
+      call_or_const_doc = -> type do
+        if name =~ /\A[A-Z]/
+          type = type.types.grep(KatakataIrb::Types::SingletonType).find { _1.module_or_class.const_defined?(name) }
+          type.module_or_class == Object ? name : "#{KatakataIrb::Types.class_name_of(type.module_or_class)}::#{name}" if type
+        else
+          method_doc.call(type)
         end
+      end
 
-        case KatakataIrb::Completor.prev_analyze_result
-        in [:call_or_const, type, _name, _self_call]
-          call_or_const_doc.call type
-        in [:const, type, _name]
-          # when prev_analyze_result is const, current analyze result might be call
-          call_or_const_doc.call type
-        in [:gvar, _name]
-          name
-        in [:call, type, _name, _self_call]
-          method_doc.call type
-        in [:lvar_or_method, _name, scope]
-          method_doc.call scope.self_type unless scope.local_variables.include?(name)
-        else
+      case KatakataIrb::Completor.prev_analyze_result
+      in [:call_or_const, type, _name, _self_call]
+        call_or_const_doc.call type
+      in [:const, type, _name]
+        # when prev_analyze_result is const, current analyze result might be call
+        call_or_const_doc.call type
+      in [:gvar, _name]
+        name
+      in [:call, type, _name, _self_call]
+        method_doc.call type
+      in [:lvar_or_method, _name, scope]
+        method_doc.call scope.self_type unless scope.local_variables.include?(name)
+      else
+      end
+    end
+
+    if IRB.const_defined? :InputCompletor # IRB::VERSION <= 1.8.1
+      IRB::InputCompletor::CompletionProc.define_singleton_method :call do |*args|
+        completion_proc.call(*args)
+      end
+      IRB::InputCompletor.singleton_class.prepend(
+        Module.new do
+          define_method :retrieve_completion_data do |input, doc_namespace: false, **kwargs|
+            return super(input, doc_namespace: false, **kwargs) unless doc_namespace
+            doc_namespace_proc.call input
+          end
+        end
+      )
+    elsif IRB.const_defined? :RegexpCompletor # IRB::VERSION >= 1.8.2
+      IRB::RegexpCompletor.class_eval do
+        define_method :completion_candidates do |preposing, target, postposing, bind:|
+          completion_proc.call(target, preposing, postposing)
+        end
+        define_method :doc_namespace do |_preposing, matched, _postposing, bind:|
+          doc_namespace_proc.call matched
         end
       end
-    }
+    else
+      puts 'Cannot activate katakata_irb'
+    end
+
     setup_type_dialog
   end
 

data/lib/katakata_irb/nesting_parser.rb

@@ -9,8 +9,11 @@ module KatakataIrb::NestingParser
   ]
 
   def self.tokenize(code)
+    verbose, $VERBOSE = $VERBOSE, nil
     tokens = Ripper::Lexer.new(code).scan.reject { ERROR_TOKENS.include? _1.event }
     KatakataIrb::NestingParser.interpolate_ripper_ignored_tokens code, tokens
+  ensure
+    $VERBOSE = verbose
   end
 
   def self.interpolate_ripper_ignored_tokens(code, tokens)

data/lib/katakata_irb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KatakataIrb
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katakata_irb
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - tompng
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb