nrepl-lazuli 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2439208ce1a3db5af7c886aa95b577bb713667461c92d129e997f378ca704926
-  data.tar.gz: 6aabf3d36d3996ff158a2c50ebaa6239570e4799614a8d7110d50df7ca1ede4f
+  metadata.gz: 8c38f3cd330d07e579fff5971c656a12c4ee9f9a1488aba33d8183dd80b1236c
+  data.tar.gz: a63be29edddccc449e4a5bbdd9f80a05e2fb2fa0b3ca0b271ee50830da521118
 SHA512:
-  metadata.gz: 755e29ac97e588baca03a48914cc968d23d96961c66c4a3778554bc29b2d14f05ac236f9d15a1b565318cab9a11c28bc1a07cf096911da656f1450c4ae52ac7f
-  data.tar.gz: a6fabeadef479c719f9fa60b53587e85d0d25fd88e96a03311103b0a5a581cccb54425ebd68c9e75cb01e69335dc755631699153bb44501ec51d756d0dc693a8
+  metadata.gz: 2d75413ea25c513b6107daacd4f4128649c7696fc170f8536d8f636a166ce5fcb9ba675a4c218de9b9ec906f488c7cc9dfbdd48afbce0e828677d08c0bc96283
+  data.tar.gz: a3bb98a1bc7d9ba46d9bbc0cd1ea3b30dfa186da9444a80acf03015c427430962d4bf3f14dfc0d695b7050fe8caf632b14c1bac0a92edbe65ee9fd0f04a803c5

data/lib/nrepl-lazuli/connection.rb

@@ -16,10 +16,11 @@ module NREPL
       @binding = binding
       @bindings = bindings
       @bindings_by_id = bindings_by_id
+      @retries = 0
     end
 
     def treat_messages!
-      bencode = BEncode::Parser.new(@in)
+      bencode = BEncode.new(@in)
       loop do
         break if @in.eof?
         msg = bencode.parse!
@@ -30,6 +31,8 @@ module NREPL
       @pending_evals.each { |(i, _)| clear_eval!(i) }
     rescue Errno::ECONNRESET
       @pending_evals.each { |(i, _)| clear_eval!(i) }
+    rescue => e
+      STDOUT.puts "CRASH! #{e}"
     end
 
     def treat_msg(msg)
@@ -87,13 +90,42 @@ module NREPL
             'status' => ['done', 'interrupted'],
             'op' => msg['op']
           }))
-
         else
           send_msg(response_for(msg, {
             'status' => ['done'],
             'op' => msg['op']
           }))
         end
+      when 'update_watch_lines'
+        msg['id'] ||= "eval_#{@counter += 1}"
+        file = msg['file']
+        initial_line = msg['line']
+        delta = msg['delta']
+        rows_bindings = @bindings[file] || {}
+        rows_bindings.keys.each do |row|
+          if row > initial_line
+            watch = rows_bindings.delete(row)
+            new_row = row + delta
+            old_id = "#{file}:#{row+1}"
+            new_id = "#{file}:#{new_row+1}"
+
+            watch.keys.each do |id|
+              if id == old_id
+                watch_per_id = @bindings_by_id.delete(id)
+                @bindings_by_id[new_id] = watch_per_id.update(row: new_row)
+              else
+                @bindings_by_id[id][:row] = new_row
+              end
+            end
+            rows_bindings[new_row] = watch
+            old_binding = watch.delete(old_id)
+            watch[new_id] = old_binding if(old_binding)
+          end
+        end
+
+        get_watches(msg)
+      when 'get_watches'
+        get_watches(msg)
       when 'watches_for_file'
         msg['id'] ||= "eval_#{@counter += 1}"
         file = msg['file']
@@ -112,6 +144,22 @@ module NREPL
       end
     end
 
+    private def get_watches(msg)
+      msg['id'] ||= "eval_#{@counter += 1}"
+      file = msg['file']
+      rows_bindings = @bindings[file] || {}
+      watches = rows_bindings.flat_map do |row, watch|
+        watch.map do |id, _|
+          { 'file' => file, 'line' => row, 'id' => id }
+        end
+      end
+      send_msg(response_for(msg, {
+        'status' => ['done'],
+        'watches' => watches.sort_by { |w| w['line'] },
+        'op' => msg['op']
+      }))
+    end
+
     private def eval_op(msg, stop)
       msg['id'] ||= "eval_#{@counter += 1}"
       id = msg['id']
@@ -174,7 +222,7 @@ module NREPL
     end
 
     private def evaluate_code(code, file, line, bind)
-      bind ||= @@binding
+      bind ||= TOPLEVEL_BINDING.dup
       line = line ? line + 1 : 1
       eval(code, bind, file || "EVAL", line).inspect
     end
@@ -251,11 +299,11 @@ module NREPL
 
     def send_msg(msg)
       debug "Sending", msg
-      @out.write(msg.bencode)
+      @out.write_nonblock(BEncode.encode(msg))
       @out.flush
+    rescue IO::EAGAINWaitWritable
+      @retries += 1
+      @out.close if @retries > 50
     end
   end
 end
-
-# To avoid locally binding with the NREPL::Connection module
-NREPL::Connection.class_variable_set(:@@binding, binding)

data/lib/nrepl-lazuli/server.rb

@@ -3,8 +3,8 @@
 # A Ruby port of ogion https://gitlab.com/technomancy/ogion &
 # https://github.com/borkdude/nrepl-server/blob/master/src/borkdude/nrepl_server.clj
 
-require 'bencode'
 require 'socket'
+require_relative 'bencode'
 require_relative 'connection'
 require_relative 'fake_stdout'
 
@@ -43,8 +43,18 @@ module NREPL
       @debug = debug
       @connections = Set.new
       @binding = binding
-      @bindings = {}
-      @bindings_by_id = {}
+      loc = caller_locations.reject { |x| x.absolute_path =~ /nrepl\-lazuli/ }[0]
+      loc = caller_locations[0] if(!loc)
+      path = loc.absolute_path
+      line = loc.lineno - 1
+      @bindings = {path => {line => {"NREPL::Server.start" => binding}}}
+      @bindings_by_id = {
+        "NREPL::Server.start" => {
+          binding: binding,
+          file: path,
+          row: line
+        }
+      }
       @tracing = tracing
       Thread.current[:nrepl_server] = self
       NREPL.class_variable_set(:@@connections, @connections)
@@ -96,17 +106,20 @@ module NREPL
     def auto_create_bindings!
       dir_regex = Regexp.new("^#{Regexp.escape(@pwd)}")
       @call_trace = TracePoint.new(:class, :call) do |tp|
-        id = "#{tp.path}:#{tp.lineno}"
+        path = tp.path
+        next if tp.path =~ /^(\<|.eval)/
+        path = File.join(@pwd, path) if File.dirname(path) == '.'
+        id = "#{path}:#{tp.lineno}"
         b = tp.binding
-        @bindings_by_id[id] = {binding: b, file: tp.path, row: tp.lineno-1}
-        @bindings[tp.path] ||= {}
-        @bindings[tp.path][tp.lineno-1] ||= {}
-        @bindings[tp.path][tp.lineno-1][id] = b
-        if tp.path =~ dir_regex
+        @bindings_by_id[id] = {binding: b, file: path, row: tp.lineno-1}
+        @bindings[path] ||= {}
+        @bindings[path][tp.lineno-1] ||= {}
+        @bindings[path][tp.lineno-1][id] = b
+        if path =~ dir_regex
           @connections.each do |connection|
             connection.send_msg(
               'op' => 'hit_auto_watch',
-              'file' => tp.path,
+              'file' => path,
               'line' => tp.lineno-1,
               'status' => ['done']
             )

data/lib/nrepl-lazuli.rb

@@ -27,7 +27,7 @@ module NREPL
         'op' => 'hit_watch',
         'id' => id,
         'file' => file,
-        'line' => row,
+        'line' => row - 1,
         'status' => ['done']
       )
     end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nrepl-lazuli
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Maurício Szabo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bencode
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.2
+date: 2024-11-13 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)
 email: mauricio@szabo.link
@@ -38,7 +24,8 @@ files:
 homepage: https://gitlab.com/clj-editors/nrepl-lazuli
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://gitlab.com/clj-editors/nrepl-lazuli
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -54,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: A Ruby nREPL server