editor_core 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec52d9db82e48638cbc82762edbfc019f825beda5eafa66475f18254c69e1f4e
-  data.tar.gz: 354a5ae6fb35b9bb195df0ace5c579a1643b61dbd0e8449ce7428c62b9fefd98
+  metadata.gz: 8bbf8d36bb4ce04088ab0a8343dffd83be278692e585c0d4e31999a3480d2e3a
+  data.tar.gz: 280aa2304b7495ff16202d2c49de3c72d6b9d509f93fa8d2f1a2ffca2402eecd
 SHA512:
-  metadata.gz: 1d65ef8b4ca8ca3138a67e0684bd3f315569423d715fc6fff022edb2d1c3b717db1efedfb4892711992107056c9afe29e30114beef2fb7c4d3c5350ea3ea8ba1
-  data.tar.gz: 483e3d2feb7dda1c78b5634612b92eb3f946c86921ae7898a81a3c73b665fd2d26c1edac0a724faed232b4ee190fcc1c3a1f37f72e979862132c95c400262775
+  metadata.gz: 796e196320ad8607cce128794403a764d277085461b40c24b4c61177e376816e886d52f8b66ec5b7cf2163ae9eeede6057ef3f36ad14b34af72bb262caebe6e2
+  data.tar.gz: c905cc8eb1acb375947adc5b9d36187c8c6522d489ae97b71ae8a989fd3dfcd7093a0ed1e0759a3c351e6374404d9c0f2bc592ae7774677c3896e27ccc9da1d7

data/README.md

@@ -28,7 +28,11 @@ TODO: Write usage instructions here
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake
+install`. To release a new version, update the version number in
+`version.rb`, and then run `bundle exec rake release`, which will create
+a git tag for the version, push git commits and tags, and push the `.gem`
+file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/lib/editor_core/core.rb

@@ -58,7 +58,7 @@ module EditorCore
 
     def page_down
       lines = view_down(view.height-1)
-      @cursor = cursor.down(buffer, lines)
+      #@cursor = cursor.down(buffer, lines)
     end
 
     def page_up
@@ -70,6 +70,7 @@ module EditorCore
       oldtop = view.top
       view.top -= offset
       view.top = 0 if view.top < 0
+      up(offset)
       oldtop - view.top
     end
 
@@ -79,6 +80,7 @@ module EditorCore
       if view.top > buffer.lines_count
         view.top = buffer.lines_count
       end
+      down(offset)
       view.top - oldtop
     end
 
@@ -91,6 +93,8 @@ module EditorCore
     end
 
     # ## Complex navigation ##
+
+    # FIXME: Rewrite like prev_word
     def next_word
       line = current_line
       c = cursor.col
@@ -115,24 +119,40 @@ module EditorCore
     end
 
 
-    def prev_word
-      return if cursor.col == 0
-      line = current_line
-      c = cursor.col
-      if c > 0
-        c -= 1
-      end
-      while c > 0 && line[c] && line[c].match(/[ \t]/)
-        c -= 1
+    def beginning_of_file?
+      cursor&.beginning_of_file?
+    end
+
+    def current_char
+      current_line[cursor.col]
+    end
+
+    def left_until_match(r)
+      off = -1
+      loop do
+        left
+        off +=1
+        break if beginning_of_file? || current_char&.match(r)
       end
-      while c > 0 && !(line[c-1].match(/[ \t\-]/))
-        c -= 1
+      off
+    end
+
+    def left_while_match(r)
+      off = 0
+      while !beginning_of_file? && current_char&.match(r)
+        left
+        off +=1
       end
-      off = cursor.col - c
-      @cursor = Cursor.new(cursor.row, c)
+      # Because we'll advance once too far left
+      right if !current_char&.match(r)
       off
     end
 
+    def prev_word
+      word = /[A-Za-z]/
+      left_until_match(word) + left_while_match(word)
+    end
+
     # ## Mutation ##
 
     def delete_before

data/lib/editor_core/version.rb

@@ -1,3 +1,3 @@
 module EditorCore
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: editor_core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vidar Hokstad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: