nvim 1.13.4 → 1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86b2b03d1aaf9ccb0a8f8c9cfcc356da5c0166bffc973ac2aaea7faf7a360b83
-  data.tar.gz: 4af7414f996231c2070b00b157eeb3e097aa852da302f9bb512412d394919975
+  metadata.gz: dedacdadce72f297ba984b9e6ad211d23e3a990a5b6a456a88ebda1c2c84e4fa
+  data.tar.gz: 8b4608fb8ba6d587e69422d37f5b172179a901cb5015bfbd7320c21b1c9f2045
 SHA512:
-  metadata.gz: ee684cf65ee6c9e80b38e9a58023c3832fdd1824fe29d919da54c63e723527aae2a234e3204452fb8ee3fa883db6a1a3cf577e88f7d51ffc9acdc894f184d841
-  data.tar.gz: 261486d13c57469eae397f4af2cce20e680356e03511257f8ab7cc95e3d914b7cdb3a46084ce0aabe80abe4d6e6e86557901ec18c8ca18d172d75a3b0c62b904
+  metadata.gz: 50d5f48e393e1465668efe51e21910841edcd91b94fa2c106f7ea6d665bd598ba85d4753eeb19a574ebda966e75004570f237f5f709f5f8aa3e9efc681a01c22
+  data.tar.gz: a24faf04fd4a18ce729cf3fc6b397d729f3ea5022fafeff49169bc38105549fc149a84deb63683cb21e9ce6bfb90608a3ca288774f0a168f0d9326f81841e8c3

data/INFO.yaml

@@ -3,7 +3,7 @@
 #
 
 nvim:
-  version: "1.13.4"
+  version: "1.14"
   license: LicenseRef-BSD-2-Clause-and-DECENT_LANGUAGE
   authors:
     - Bertram Scharpf

data/lib/neovim/client.rb

@@ -129,11 +129,11 @@ module Neovim
       when Buffer then @client, @buffer = client.client, client.index
       else             @client, @buffer = client,        0
       end
-      @i, @last = range.begin, range.end
+      @first, @last = range.begin, range.end
     end
 
     def to_s
-      (@client.buf_get_lines @buffer, @i-1, @last, true).join $/
+      (@client.buf_get_lines @buffer, @first-1, @last, true).join $/
     end
 
     def method_missing sym, *args, **kwargs, &block
@@ -141,46 +141,64 @@ module Neovim
     end
 
     def each
-      while @i <= @last do
-        @inc = 1
-        l, = @client.buf_get_lines @buffer, @i-1, @i, true
-        yield l
-        @i += @inc
+      if block_given? then
+        begin
+          @i = @first
+          while @i <= @last do
+            l, = @client.buf_get_lines @buffer, @i-1, @i, true
+            yield l, @i
+            @i += 1
+          end
+        ensure
+          @i = nil
+        end
+      else
+        Enumerator.new { |y| each { |l,i| y.yield l, i } }
       end
-    ensure
-      @i = nil
     end
     alias each_line each
 
-    def each_with_no
-      each do |l|
-        yield l, @i
+    def map!
+      if block_given? then
+        each do |l|
+          m = yield l, @i
+          if m != l then
+            r = Neovim.result_lines m
+            @client.buf_set_lines @buffer, @i-1, @i, true, r
+            inc = r.length - 1
+            @i    += inc
+            @last += inc
+          end
+        end
+      else
+        Enumerator.new { |y| map! { |l,i| y.yield l, i } }
       end
     end
+    alias collect! map!
 
-    def map!
-      each do |l|
-        h = l.hash
-        m = yield l, @i
-        if not String === m or m.hash != h then
-          r = result_strings m
-          r.flatten!
-          @client.buf_set_lines @buffer, @i-1, @i, true, r
-          @inc = r.length
-          @last += @inc-1
+    def reject!
+      if block_given? then
+        each do |l|
+          if yield l, @i then
+            @client.buf_set_lines @buffer, @i-1, @i, true, []
+            @i    -= 1
+            @last -= 1
+          end
         end
+      else
+        Enumerator.new { |y| reject! { |l,i| y.yield l, i } }
       end
     end
+    alias delete_if reject!
 
-    private
-
-    def result_strings obj
-      case obj
-      when Enumerable then obj.map { |l| result_strings l }
-      when nil        then []
-      else                 obj.to_s.scan /^.*$/
+    def select!
+      if block_given? then
+        reject! { |l,i| not (yield l, i) }
+      else
+        Enumerator.new { |y| select! { |l,i| y.yield l, i } }
       end
     end
+    alias filter! select!
 
   end
 

data/lib/neovim/info.rb

@@ -1,6 +1,6 @@
 require "neovim/meta.rb"
 Neovim::INFO = Neovim::Meta.new "nvim",
-  version: "1.13.4",
+  version: "1.14",
   license: "LicenseRef-BSD-2-Clause-and-DECENT_LANGUAGE",
   authors: ["Bertram Scharpf"],
   email: "software@bertram-scharpf.de",

data/lib/neovim/remote_object.rb

@@ -147,7 +147,7 @@ module Neovim
 
     def []= pos = nil, len = nil, str
       line_indices pos, len do |fst,lst|
-        set_lines fst, lst, false, (str_lines str)
+        set_lines fst, lst, false, (Neovim.result_lines str)
       end
       self
     end
@@ -193,36 +193,60 @@ module Neovim
     include Enumerable
 
     def each pos = nil, len = nil, &block
-      iter_chunks pos, len do |fst,nxt|
-        (get_lines fst, nxt, true).each &block
+      if block_given? then
+        iter_chunks pos, len do |l|
+          l.each &block
+        end
+      else
+        Enumerator.new { |y| each { |x,i| y.yield x, i } }
       end
     end
 
     def map! pos = nil, len = nil, &block
-      iter_chunks pos, len do |fst,nxt|
-        l = (get_lines fst, nxt, true).map &block
-        set_lines fst, nxt, true, l
+      if block_given? then
+        iter_chunks pos, len do |l|
+          n = l.length
+          m = l.map &block
+          if m != l then
+            r = Neovim.result_lines m
+            set_lines @fst, @fst+n, true, r
+            inc = r.length - n
+            @fst += inc
+            @lst += inc
+          end
+        end
+      else
+        Enumerator.new { |y| map! { |x,i| y.yield x, i } }
       end
     end
+    alias collect! map!
 
-    def select! pos = nil, len = nil, &block
-      line_indices_positive pos, len do |fst,lst|
-        while fst < lst do
-          l, = get_lines fst, fst+1, true
-          if yield l then
-            fst += 1
-          else
-            set_lines fst, fst+1, true, []
-            lst -= 1
+    def reject! pos = nil, len = nil, &block
+      if block_given? then
+        iter_chunks pos, len do |l|
+          n = l.length
+          l.reject! &block
+          if l.length < n then
+            set_lines @fst, @fst+n, true, l
+            inc = l.length - n
+            @fst += inc
+            @lst += inc
           end
         end
+      else
+        Enumerator.new { |y| map! { |x,i| y.yield x, i } }
       end
     end
+    alias delete_if reject!
 
-    def reject! pos = nil, len = nil, &block
-      select! pos, len do |l| !yield l end
+    def select!
+      if block_given? then
+        reject! { |l| not (yield l) }
+      else
+        Enumerator.new { |y| select! { |l| y.yield l } }
+      end
     end
-
+    alias filter! select!
 
     # Don't run into `method_missing`.
     def get_lines fst, lst, strict      ; call_obj :get_lines, fst, lst, strict      ; end
@@ -262,32 +286,22 @@ module Neovim
       end
     end
 
-    @chunk = 1024  # Attention! Each chunk is its own undo level.
+    @chunk_length = 1024
     class <<self
-      attr_accessor :chunk
+      attr_accessor :chunk_length
     end
 
     def iter_chunks pos, len
       line_indices_positive pos, len do |fst,lst|
-        while lst do
-          nxt = fst + self.class.chunk
-          if nxt > lst then
-            nxt, lst = lst, nil
-          end
-          yield fst, nxt
-          fst = nxt
+        @fst, @lst = fst, lst
+        while @fst < @lst do
+          l = get_lines @fst, @fst+self.class.chunk_length, false
+          yield l
+          @fst += self.class.chunk_length
         end
       end
-    end
-
-    def str_lines str
-      if Array === str then
-        str
-      elsif str.nil? then
-        []
-      else
-        str.lines.each { |l| l.chomp! }
-      end
+    ensure
+      @fst = @lst = nil
     end
 
   end
@@ -330,5 +344,18 @@ module Neovim
 
   end
 
+
+  class <<self
+
+    def result_lines obj
+      case obj
+      when Enumerable then obj.inject [] do |s,l| s.push *(result_lines l) end
+      when nil        then []
+      else                 obj.to_s.scan /^.*$/
+      end
+    end
+
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nvim
 version: !ruby/object:Gem::Version
-  version: 1.13.4
+  version: '1.14'
 platform: ruby
 authors:
 - Bertram Scharpf