nrepl-lazuli 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e7940230b6c771925c5ee557cecd7a98e043cbe94fed89efe8dee2ce77611c5
-  data.tar.gz: e36fda8c9c90cdb098e8e5e8307ce487cb28776d3c0de28e075964fea7acb4ed
+  metadata.gz: 850adfc6733e86d502ffd88241f4dff665e34870c6c2a7d6a436ee77685565e8
+  data.tar.gz: 50d6783deae1558218fc67a1d47590c2e92d07f964daa7038d3b6f51aec2d7dc
 SHA512:
-  metadata.gz: e7a121b406ed724c1c433cd9a854f6082d1628b0557ebc9fb9bbd6f9e6c8a26c2f9c0390708f954ef3154b107d5234d7a332e343911426585c7fb9ec82b35247
-  data.tar.gz: e183f6dc2766a16297f27fbf08b7c164b9b43e8c88b753fff43bedb96b1a3ef2b7649187a53703a6d591e18c6c1d3fc7d578f7af9ac4b5b39b87c861b392f490
+  metadata.gz: 6133a4d27d93dcaf60bb06c4415384cb09e31bf08a89dd03059181fec2eba3ebc7695a890a77f8349fdea91eda292d2e8444ae365e8d59a00f96b41dec435bd8
+  data.tar.gz: a3df651980e3684fd0fffd2ef2a400dfdcf25b79ffc3e554c8425e9a880d929effc0b9fb62631f5ea8a6cb84c6ec72e80b07b7c7b3ea850372fc8f85b0239d12

data/lib/nrepl-lazuli/bencode.rb

@@ -0,0 +1,96 @@
+class BEncode
+  def self.encode(data)
+    case data
+    when Integer
+      "i#{data}e"
+    when String
+      "#{data.bytesize}:#{data}"
+    when Array
+      "l#{data.map { |e| encode(e) }.join}e"
+    when Hash
+      "d#{data.map { |k, v| encode(k) + encode(v) }.join}e"
+    else
+      raise ArgumentError, "Cannot BEncode type: #{data.class} on text #{data.inspect}"
+    end
+  end
+
+  def initialize(stream)
+    @stream =
+      if stream.kind_of?(IO) || stream.kind_of?(StringIO)
+        stream
+      elsif stream.respond_to? :string
+        StringIO.new stream.string
+      elsif stream.respond_to? :to_s
+        StringIO.new stream.to_s
+      end
+    @encoding = @stream.external_encoding || Encoding::default_external
+  end
+
+  def parse!
+    case peek
+      when ?i then parse_integer!
+      when ?l then parse_list!
+      when ?d then parse_dict!
+      when ?0 .. ?9 then parse_string!
+    end
+  end
+
+  def eos?
+    @stream.eof?
+  end
+
+  private
+
+  def parse_integer!
+    @stream.getc
+    num = @stream.gets("e") or raise ArgumentError
+    num.chop.to_i
+  end
+
+  def parse_list!
+    @stream.getc
+    ary = []
+    ary.push(parse!) until peek == ?e
+    @stream.getc
+    ary
+  end
+
+  def parse_dict!
+    @stream.getc
+    hsh = {}
+    until peek == ?e
+      key = parse!
+
+      unless key.is_a? String or key.is_a? Integer
+        raise ArgumentError, "key must be a string or number"
+      end
+
+      val = parse!
+
+      hsh.store(key.to_s, val)
+    end
+    @stream.getc
+    hsh
+  end
+
+  def parse_string!
+    num = @stream.gets(":") or
+      raise ArgumentError, "invalid string length (no colon)"
+
+    begin
+      length = num.chop.to_i
+      return "" if length == 0 # Workaround for Rubinius bug
+      str = @stream.read(length).force_encoding(@encoding)
+    rescue => e
+      raise ArgumentError, "invalid string length #{e}"
+    end
+
+    str
+  end
+
+  def peek
+    c = @stream.getc
+    @stream.ungetc(c)
+    c
+  end
+end

data/lib/nrepl-lazuli/client.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require_relative 'bencode'
+require 'timeout'
+
+module NREPL
+  class Client
+    attr_reader :host, :port
+
+    def initialize(port: DEFAULT_PORT, host: DEFAULT_HOST)
+      @port       = port
+      @host       = host
+      @socket = TCPSocket.new(@host, @port)
+      @bencode = BEncode.new(@socket)
+      @last_id = 0
+    end
+
+    def stop
+      unless closed?
+        @socket.close
+        @socket = nil
+        @bencode = nil
+      end
+    end
+
+    def rpc(msg)
+      id = msg["id"] || msg[:id]
+      if(!id)
+        @last_id += 1
+        id = "autogen_#@last_id"
+        msg = msg.merge('id' => id)
+      end
+
+      write(msg)
+      Timeout.timeout(10) do
+        loop do
+          ret = read
+          if(ret["id"] == id)
+            break ret
+          end
+        end
+      end
+    end
+
+    def write(msg)
+      @socket.write(BEncode.encode(msg))
+      @socket.flush
+    end
+
+    def read
+      @bencode.parse!
+    end
+
+    def register_session
+      write('op' => 'clone')
+      msg = read!
+
+      raise ArgumentError, "failed to create session" unless msg['new_session']
+      msg['new_session']
+    end
+
+    def closed?
+      @socket.nil?
+    end
+  end
+end

data/lib/nrepl-lazuli/connection.rb

@@ -43,6 +43,10 @@ module NREPL
       case msg['op']
       when 'clone'
         register_session(msg)
+      when 'complete'
+        get_completions(msg)
+      when 'find_definition'
+        find_definition(msg)
       when 'describe'
         describe_msg(msg)
       when 'eval'
@@ -152,6 +156,97 @@ module NREPL
       end
     end
 
+    private def get_completions(msg)
+      wrap_all = ->(coll, type) do
+        coll.lazy.map { |c| { 'candidate' => c.to_s, 'type' => type } }
+      end
+      prefix_reg = Regexp.new(msg['prefix'].split('').map { |x| Regexp.escape(x) }.join('.*'))
+      context = msg.fetch('context', {})
+      methods = ->(callee) do
+        wrap_all.(callee.public_methods, 'method/public') +
+          wrap_all.(callee.protected_methods, 'method/protected') +
+          wrap_all.(callee.private_methods, 'method/private')
+      end
+
+      completions = case context['type']
+      when 'symbol'
+        prefix_reg = Regexp.new(msg['prefix'].sub(':', ''))
+        symbols = Symbol.all_symbols.lazy.select { |s| s.to_s =~ prefix_reg }
+        completions = symbols.map { |c| { 'candidate' => ":#{c}", 'type' => 'label' } } +
+          symbols.map { |c| { 'candidate' => "#{c}:", 'type' => 'label' } }
+        send_msg(response_for(msg, {
+          'status' => ['done'],
+          'completions' => completions.to_a.uniq
+        }))
+        return
+      when 'constant'
+        me = evaluate_code("self", msg)
+        wrap_all.(me.class.constants, 'constant') +
+          wrap_all.(Object.constants, 'constant')
+      when 'call'
+        if context['separator'] == '::'
+          wrap_all.(evaluate_code(context['callee'], msg).constants, 'constant')
+        else
+          methods.(evaluate_code(context['callee'], msg))
+        end
+      when 'identifier'
+        methods.(evaluate_code('self', msg)) +
+          wrap_all.(evaluate_code('binding.local_variables', msg), 'local')
+      when 'instance_variable'
+        wrap_all.(evaluate_code('instance_variables', msg), 'attribute/instance')
+      when 'class_variable'
+        me = evaluate_code('self', msg)
+        if me.instance_of?(Class)
+          wrap_all.(me.class_variables, 'attribute/class')
+        else
+          wrap_all.(me.class.class_variables, 'attribute/class')
+        end
+      when 'scope_resolution'
+        wrap_all.(evaluate_code(context['callee'], msg).constants, 'constant')
+      end
+
+      send_msg(response_for(msg, {
+        'status' => ['done'],
+        'completions' => completions.select { |x| x['candidate'] =~ prefix_reg }.to_a.uniq
+      }))
+    rescue Exception
+      send_msg(response_for(msg, {
+        'status' => ['done'],
+        'completions' => []
+      }))
+    end
+
+    private def find_definition(msg)
+      # {
+      #   "op" => "find_definition",
+      #   "file" => "/tmp/some_file.rb",
+      #   "line" => 7,
+      #   "symbol" => "upcase",
+      #   "id" => "d1",
+      #   "context" => {"prefix" => "a_string"}
+      # }
+      prefix = msg.fetch('context', {}).fetch('prefix', 'self')
+      prefix_class = evaluate_code("#{prefix}.class", msg)
+      result = prefix_class.__lazuli_source_location(msg.fetch('symbol').intern)
+
+      if result.nil?
+        send_msg(response_for(msg, {
+          'status' => ['done', 'notfound']
+        }))
+      else
+        file, row = result
+        send_msg(response_for(msg, {
+          'file' => file,
+          'line' => row - 1,
+          'status' => ['done']
+        }))
+      end
+    rescue Exception => e
+      send_msg(response_for(msg, {
+        'status' => ['done', 'notfound']
+      }))
+    end
+
     private def get_watches(msg)
       msg['id'] ||= "eval_#{@counter += 1}"
       file = msg['file']
@@ -213,15 +308,13 @@ module NREPL
           code = code.gsub(/^NREPL\.stop!$/, "NREPL.stop_#{method_name}(binding)")
           define_stop_function!(msg, method_name)
         end
-
-        original_bind = if msg['stop_id']
-          @pending_evals.fetch(msg['stop_id'], {})[:binding]
-        elsif msg['watch_id']
-          @bindings_by_id.fetch(msg['watch_id'], {})[:binding]
-        else
-          find_row_based_binding(msg) || @binding
-        end
-        evaluate_code(code, msg['file'], msg['line'], original_bind)
+        begin
+          res = evaluate_code(code, msg)
+          [:result, res]
+        rescue Exception => e
+          raise e if e.is_a?(SyntaxError)
+          [:error, e.inspect.sub(/\>$/, ' stack=' + e.backtrace.inspect+'>')]
+        end.inspect
       end
 
       unless pending_eval[:stopped?]
@@ -229,10 +322,77 @@ module NREPL
       end
     end
 
-    private def evaluate_code(code, file, line, bind)
+    private def inspect_result(result)
+      return result.inspect
+
+      class_for_res = ->{ result.class.ancestors.find(&:name) }
+      case result
+      # when BigDecimal
+      #   ["literal", "BigDecimal: #{result.to_f}"]
+      when String
+        ["string", result]
+      when Numeric
+        ["number", result.to_s]
+      when Hash
+        [
+          "map",
+          nil,
+          "{",
+          " => ",
+          ", ",
+          "}",
+          result.map { |(k, v)| [inspect_result(k), inspect_result(v)] }
+        ]
+      when Array
+        ["coll", nil, "[", ", ", "]", result.map { |i| inspect_result(i) }]
+      # when Enumerable
+      #   ["coll", class_for_res.().name, "[", ", ", "]", result.map { |i| inspect_result(i) }]
+      when Exception
+        [
+          "exception",
+          ["literal", "#{class_for_res.().name}: #{result.message}"],
+          (result.backtrace_locations || []).map { |l| [l.path, l.lineno, nil, l.label] }
+        ]
+      else
+        inspected = result.inspect
+        match = inspected.match(/#\<(.*)\>/)
+        if match
+          vars = match.captures[0]
+          inner_vars = vars.scan(/\w(?:[\w\d_]\??)+=/)
+          inners = inner_vars.flat_map do |v|
+            begin
+              v = v.chop
+              [[["literal", v], inspect_result(result.send(v))]]
+            rescue NoMethodError
+              []
+            end
+          end
+          [
+            "object",
+            class_for_res.().name,
+            result.inspect,
+            inners
+          ]
+        else
+          [ "literal", result.inspect ]
+        end
+      end
+    end
+
+    private def evaluate_code(code, msg)
+      bind = if msg['stop_id']
+        @pending_evals.fetch(msg['stop_id'], {})[:binding]
+      elsif msg['watch_id']
+        @bindings_by_id.fetch(msg['watch_id'], {})[:binding]
+      else
+        find_row_based_binding(msg) || @binding
+      end
+      file = msg['file'] || 'EVAL'
+      line = (msg['line'] || 0) + 1
+      # evaluate_code(code, msg['file'], msg['line'], original_bind)
       bind ||= TOPLEVEL_BINDING.dup
-      line = line ? line + 1 : 1
-      eval(code, bind, file || "EVAL", line).inspect
+      # line = line ? line + 1 : 1
+      eval(code, bind, file, line)
     end
 
     private def find_row_based_binding(msg)
@@ -302,7 +462,8 @@ module NREPL
     end
 
     def send_exception(msg, e)
-      send_msg(response_for(msg, { 'ex' => e.message, 'status' => ['done', 'error'] }))
+      error = e.inspect.sub(/\>$/, ' stack=' + e.backtrace.inspect+'>')
+      send_msg(response_for(msg, { 'ex' => error, 'status' => ['done', 'error'] }))
     end
 
     def send_msg(msg)

data/lib/nrepl-lazuli/server.rb

@@ -8,6 +8,8 @@ require_relative 'bencode'
 require_relative 'connection'
 require_relative 'fake_stdout'
 
+$pwd = Dir.pwd
+
 module NREPL
   class Server
     attr_reader :debug, :port, :host, :call_trace
@@ -39,7 +41,7 @@ module NREPL
       loader: nil
     )
       @port  = port
-      @pwd = pwd
+      $pwd = pwd
       @host  = host
       @debug = debug
       @connections = Set.new
@@ -107,11 +109,11 @@ module NREPL
     end
 
     def auto_create_bindings!
-      dir_regex = Regexp.new("^#{Regexp.escape(@pwd)}")
+      dir_regex = Regexp.new("^#{Regexp.escape($pwd)}")
       trace_proc = proc do |tp|
         path = tp.path
         next if tp.path =~ /^(\<|.eval)/
-        path = File.join(@pwd, path) if File.dirname(path) == '.'
+        path = File.join($pwd, path) if File.dirname(path) == '.'
         id = "#{path}:#{tp.lineno}"
         b = tp.binding
         @bindings_by_id[id] = {binding: b, file: path, row: tp.lineno-1}
@@ -182,13 +184,6 @@ module NREPL
 
   Thread.prepend(ThreadPatch)
 
-  # Also...
-  module MethodLocationFixer
-    def __lazuli_source_location
-      @__lazuli_source_location || source_location
-    end
-  end
-
   module DefinitionFixer
     @@definitions = {}
 
@@ -211,8 +206,8 @@ module NREPL
 
     def method_added(method_name)
       return if method_name == :__lazuli_source_location
-      pwd = Dir.pwd
-      path = caller.select { |x| x.start_with?(pwd) }[0]
+
+      path = caller.select { |x| x.start_with?($pwd) }[0]
       if path
         (file, row) = path.split(/:/)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: nrepl-lazuli
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Maurício Szabo
 bindir: bin
 cert_chain: []
-date: 2025-04-04 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby nREPL server, made to be used with Lazuli plug-in (but can be
   used with any nREPL client too)
@@ -17,6 +17,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/nrepl-lazuli.rb
+- lib/nrepl-lazuli/bencode.rb
+- lib/nrepl-lazuli/client.rb
 - lib/nrepl-lazuli/connection.rb
 - lib/nrepl-lazuli/fake_stdout.rb
 - lib/nrepl-lazuli/server.rb
@@ -39,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.6
 specification_version: 4
 summary: A Ruby nREPL server
 test_files: []