nrepl-lazuli 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e198f7aeaa4e73c02bb95aab3cc78233e64730eb9da1c7a7a3b81100dc2063b1
-  data.tar.gz: f5bb2f932d3520450821ec746527c52c9a2aeb7bf2946cf37f7aa98d1b92f10e
+  metadata.gz: fb08e5429998d1320a2f3b4db07b336c389af0e3a1f008c67dbb4236af27af4a
+  data.tar.gz: 9eb7a44c8d716860eeb09f18025dd5dd47713554384e9be249683b1ec7b11bf9
 SHA512:
-  metadata.gz: 8b4b0f03d9673e708b6aabad549544d812bd3d06e63748507e39595e748a02c5a2344ac5f1d6819cb501b462b667756c3225da6a6a1254b72488f0e1115f20ea
-  data.tar.gz: 074bfe1128eac938c707fc33f2add4e388ab762ab0ecbd3113300829ffee2f67fe60f2246bf590953734065c68a40e8e398bd3a77b8104f7a81ce64a3f8bdf0a
+  metadata.gz: f3aec4c5b770994bb11be7f6fdfcbbaa4c0a1050e4964c0a10cd0cf4b95c6014ce0dd40cc765cad1815b93f429bb0c2a3a66a70aa03f730392d03bad0c71e29c
+  data.tar.gz: 33d341eddae865f76f8463353b2232aaec4edd480f12301856bf618223f8f23fe7b237397e5d39135e3d745e9c57cbf22c6e658b61f9fa68c9756ccc81c65c35

data/lib/nrepl-lazuli/connection.rb

@@ -4,8 +4,9 @@ module NREPL
 
     def initialize(
       input, debug: false, out: input,
-      watches: NREPL.class_variable_get(:@@watches), binding: nil,
-      auto_bindings: {}
+      watches: NREPL.class_variable_get(:@@bindings),
+      binding: nil,
+      bindings: {}
     )
       @debug = debug
       @in = input
@@ -14,7 +15,7 @@ module NREPL
       @watches = watches
       @counter = 0
       @binding = binding
-      @auto_bindings = auto_bindings
+      @bindings = bindings
     end
 
     def treat_messages!
@@ -84,7 +85,7 @@ module NREPL
       when 'watches_for_file'
         msg['id'] ||= "eval_#{@counter += 1}"
         file = msg['file']
-        rows_bindings = @auto_bindings[file] || {}
+        rows_bindings = @bindings[file] || {}
         send_msg(response_for(msg, {
           'status' => ['done'],
           'rows' => rows_bindings.keys.sort,
@@ -109,6 +110,7 @@ module NREPL
         begin
           eval_msg(msg, stop)
         rescue Exception => e
+          puts e.backtrace
           send_exception(msg, e)
         ensure
           @pending_evals.delete(id) unless stop
@@ -165,10 +167,10 @@ module NREPL
       row = msg['line']
       return if !file || !row
 
-      rows_bindings = @auto_bindings[file]
+      rows_bindings = @bindings[file]
       return unless rows_bindings
       found_row = row.downto(-1).find { |k| rows_bindings[k] }
-      rows_bindings[found_row]
+      rows_bindings[found_row][:binding] if found_row
     end
 
     private def define_stop_function!(msg, method_name)

data/lib/nrepl-lazuli/fake_stdout.rb

@@ -24,7 +24,8 @@ module NREPL
       nil
     end
 
-    def write(text='')
+    def write(*texts)
+      text = texts.join('')
       @connections.each do |conn|
         conn.send_msg(
           @kind => text

data/lib/nrepl-lazuli/server.rb

@@ -28,8 +28,9 @@ module NREPL
       @debug = debug
       @connections = Set.new
       @binding = binding
-      @auto_bindings = {}
+      @bindings = {}
       NREPL.class_variable_set(:@@connections, @connections)
+      NREPL.class_variable_set(:@@bindings, @bindings)
     end
 
     private def record_port
@@ -53,7 +54,7 @@ module NREPL
       s = TCPServer.new(host, port)
       loop do
         Thread.start(s.accept) do |client|
-          connection = Connection.new(client, debug: debug?, binding: @binding, auto_bindings: @auto_bindings)
+          connection = Connection.new(client, debug: debug?, binding: @binding, bindings: @bindings)
           @connections << connection
           connection.treat_messages!
           @connections.delete(connection)
@@ -66,10 +67,9 @@ module NREPL
     def auto_create_bindings!
       dir_regex = Regexp.new("^#{Regexp.escape(@pwd)}")
       @call_trace = TracePoint.new(:call) do |tp|
-        @auto_bindings[tp.path] ||= {}
-        @auto_bindings[tp.path][tp.lineno-1] = tp.binding
+        @bindings[tp.path] ||= {}
+        @bindings[tp.path][tp.lineno-1] = {binding: tp.binding, id: "#{tp.path}:#{tp.lineno}"}
         if tp.path =~ dir_regex
-          # puts "Tracing #{tp.path}:#{tp.lineno}"
           @connections.each do |connection|
             connection.send_msg(
               'op' => 'hit_auto_watch',
@@ -81,6 +81,12 @@ module NREPL
         end
       end
       @call_trace.enable
+
+      # @ex_trace = TracePoint.new(:raise) do |tp|
+      #   $foo = [tp.lineno, tp.event, tp.raised_exception, tp.binding, caller_locations]
+      #   # p $foo
+      # end
+      # @ex_trace.enable
     end
 
     def stop

data/lib/nrepl-lazuli.rb

@@ -7,15 +7,18 @@ module NREPL
   PORT_FILENAME = '.nrepl-port'
 
   require_relative 'nrepl-lazuli/server'
-  @@watches = {}
+  @@bindings = {}
   @@connections = Set.new
 
   def self.watch!(binding, id=nil)
-    (file, row) = caller[0].split(/:/)
+    loc = caller_locations[0]
+    file = loc.absolute_path
+    row = loc.lineno
     id ||= "#{file}:#{row}"
-    row = row.to_i
 
-    @@watches[id] = {binding: binding}
+    @@bindings[file] ||= {}
+    @@bindings[file][loc.lineno-1] = {id: id, binding: binding}
+
     @@connections.each do |connection|
       connection.send_msg(
         'op' => 'hit_watch',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nrepl-lazuli
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Maurício Szabo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-20 00:00:00.000000000 Z
+date: 2024-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bencode