nrepl-lazuli 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9806d1a707607c97f52c191fe34e6027fd58740ada2692d5f998e5d81e9e2e2
-  data.tar.gz: fbaa80613144afaa7cd5c0d56db8d0655819008895fc10a59904a1980dae033c
+  metadata.gz: 2deef62506da60f639206583fc37504630c3fdefcab9013a1ef25b354f51221c
+  data.tar.gz: 8374c37e1eae4d69479137163f10242ea0f287c9ffd099830b1d3d361b6c344c
 SHA512:
-  metadata.gz: fa9bbcfed7f0fb97e91805297589ab1341553d82372caf318e1118332bf1e74e4e39898cce008af093f10e2678f75505d82e4502c8b42f887ef6d75823f0cf36
-  data.tar.gz: 1fc41134491cd81daa30bf1148c9c1ce09644922d4342e4745cc48b56ab009be68784874d0e6ef34d946ae43dd90b237d7910bf60c4198fb125860987d196cc5
+  metadata.gz: c81e136417a9d6dac29f007a2539011baebc83d6975f1715eaa3f6f0799b4e63d4484bf834e729c0b53f65b0dcff09c917443f41c1f50edb1104cf3efb740390
+  data.tar.gz: a6293282dc353c2cfa998fd557a1c84a7482224009ea905f08f82c3615e38e64b4507f5927630be9f6e4e7a2d6a00a05d02e735f59b357249ccab0d7840e4a6c

data/lib/nrepl/connection.rb

@@ -2,13 +2,19 @@ module NREPL
   class Connection
     @@debug_counter = 0
 
-    def initialize(input, debug: false, out: input, watches: NREPL.class_variable_get(:@@watches))
+    def initialize(
+      input, debug: false, out: input,
+      watches: NREPL.class_variable_get(:@@watches), binding: nil,
+      auto_bindings: {}
+    )
       @debug = debug
       @in = input
       @out = out
       @pending_evals = {}
       @watches = watches
       @counter = 0
+      @binding = binding
+      @auto_bindings = auto_bindings
     end
 
     def treat_messages!
@@ -75,7 +81,15 @@ module NREPL
             'op' => msg['op']
           }))
         end
-
+      when 'watches_for_file'
+        msg['id'] ||= "eval_#{@counter += 1}"
+        file = msg['file']
+        rows_bindings = @auto_bindings[file] || {}
+        send_msg(response_for(msg, {
+          'status' => ['done'],
+          'rows' => rows_bindings.keys.sort,
+          'op' => msg['op']
+        }))
       else
         send_msg(response_for(msg, {
           'op' => msg['op'],
@@ -135,6 +149,8 @@ module NREPL
           @pending_evals.fetch(msg['stop_id'], {})[:binding]
         elsif msg['watch_id']
           @watches.fetch(msg['watch_id'], {})[:binding]
+        else
+          find_row_based_binding(msg) || @binding
         end
         evaluate_code(code, msg['file'], msg['line'], original_bind)
       end
@@ -144,6 +160,17 @@ module NREPL
       end
     end
 
+    private def find_row_based_binding(msg)
+      file = msg['file']
+      row = msg['line']
+      return if !file || !row
+
+      rows_bindings = @auto_bindings[file]
+      return unless rows_bindings
+      found_row = row.downto(-1).find { |k| rows_bindings[k] }
+      rows_bindings[found_row]
+    end
+
     private def define_stop_function!(msg, method_name)
       out, inp = IO.pipe
       send_stopped = proc do |ctx_binding, original_msg, caller|

data/lib/nrepl/fake_stdout.rb

@@ -1,9 +1,12 @@
+require "delegate"
+
 module NREPL
-  class FakeStdout
+  class FakeStdout < SimpleDelegator
     def initialize(connections, io, kind)
       @connections = connections
       @io = io
       @kind = kind
+      super(io)
     end
 
     def <<(text)
@@ -21,33 +24,13 @@ module NREPL
       nil
     end
 
-    def method_missing(method, *)
-      @io.send(method, *)
-    end
-
     def write(text)
-      @io.write(text)
       @connections.each do |conn|
         conn.send_msg(
           @kind => text
         )
       end
-    end
-
-    def flush
-      @io.flush
-    end
-
-    def close
-      @io.close
-    end
-
-    def sync
-      @io.sync
-    end
-
-    def sync=(val)
-      @io.sync = val
+      @io.write(text)
     end
   end
 end

data/lib/nrepl/server.rb

@@ -17,11 +17,18 @@ module NREPL
       new(**kwargs).start
     end
 
-    def initialize(port: DEFAULT_PORT, host: DEFAULT_HOST, debug: false)
+    def self.bind!(binding, **kwargs)
+      new(**kwargs.merge(binding: binding)).start
+    end
+
+    def initialize(port: DEFAULT_PORT, host: DEFAULT_HOST, debug: false, binding: nil, pwd: Dir.pwd)
       @port  = port
+      @pwd = pwd
       @host  = host
       @debug = debug
       @connections = Set.new
+      @binding = binding
+      @auto_bindings = {}
       NREPL.class_variable_set(:@@connections, @connections)
     end
 
@@ -38,6 +45,7 @@ module NREPL
 
       $stdout = FakeStdout.new(@connections, STDOUT, "out")
       $stderr = FakeStdout.new(@connections, STDERR, "err")
+      auto_create_bindings!
 
       Signal.trap("INT") { stop }
       Signal.trap("TERM") { stop }
@@ -45,7 +53,7 @@ module NREPL
       s = TCPServer.new(host, port)
       loop do
         Thread.start(s.accept) do |client|
-          connection = Connection.new(client, debug: debug?)
+          connection = Connection.new(client, debug: debug?, binding: @binding, auto_bindings: @auto_bindings)
           @connections << connection
           connection.treat_messages!
           @connections.delete(connection)
@@ -55,23 +63,80 @@ module NREPL
       File.unlink(PORT_FILENAME)
     end
 
+    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
+        if tp.path =~ dir_regex
+          # puts "Tracing #{tp.path}:#{tp.lineno}"
+          @connections.each do |connection|
+            connection.send_msg(
+              'op' => 'hit_auto_watch',
+              'file' => tp.path,
+              'line' => tp.lineno-1,
+              'status' => ['done']
+            )
+          end
+        end
+      end
+      @call_trace.enable
+    end
+
     def stop
       Thread.exit
       exit(0)
     end
   end
-end
 
-# Sorry, no other way...
-module ThreadPatch
-  def initialize(*args, &b)
-    @parent = Thread.current
-    super
+  # Sorry, no other way...
+  module ThreadPatch
+    def initialize(*args, &b)
+      @parent = Thread.current
+      super
+    end
+
+    def parent
+      @parent
+    end
+  end
+
+  Thread.prepend(ThreadPatch)
+
+  # Also...
+  module MethodLocationFixer
+    def __lazuli_source_location
+      @__lazuli_source_location || source_location
+    end
   end
 
-  def parent
-    @parent
+  module DefinitionFixer
+    @@definitions = {}
+
+    def __lazuli_source_location(method)
+      ancestors.each do |klass|
+        loc = (klass.instance_variable_get(:@__lazuli_methods) || {})[method]
+        return loc if loc
+      end
+      return instance_method(method).source_location
+    end
+
+    def method_added(method_name)
+      return if method_name == :__lazuli_source_location
+      # puts "Thing added #{method_name}"
+      path = caller.reject { |x| x =~ /gems.*gems/ }[0]
+      if path
+        (file, row) = path.split(/:/)
+
+        known = instance_variable_get(:@__lazuli_methods)
+        if !known
+          known = {}
+          instance_variable_set(:@__lazuli_methods, known)
+        end
+        known[method_name] = [file, row.to_i]
+      end
+    end
+
+    Module.prepend(DefinitionFixer)
   end
 end
-
-Thread.prepend(ThreadPatch)

data/lib/nrepl.rb

@@ -25,5 +25,6 @@ module NREPL
         'status' => ['done']
       )
     end
+    nil
   end
 end

metadata

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