ruco 0.0.18 → 0.0.19

data/Readme.md

@@ -60,6 +60,8 @@ TIPS
 
 TODO
 =====
+ - session storage (stay at same line/column when reopening)
+ - past detection ? (ctrl+shift+insert / Cmd+v) -> no indentation
  - selecting -> delete / overwrite / copy / cut
  - smart staying at end of line/column when changing line
  - warnings / messages

data/VERSION

@@ -1 +1 @@
-0.0.18
+0.0.19

data/lib/ruco/text_area.rb

@@ -49,8 +49,8 @@ module Ruco
 
     def insert(text)
       text = tabs_to_spaces(text)
-      if text == "\n"
-        current_whitespace = lines[@line].match(/^\s*/)[0]
+      if text == "\n" and @column >= after_last_word
+        current_whitespace = current_line.match(/^\s*/)[0]
         next_whitespace = lines[@line+1].to_s.match(/^\s*/)[0]
         text = text + [current_whitespace, next_whitespace].max
       end
@@ -70,7 +70,7 @@ module Ruco
     def delete_line
       old_position = position
       move :to_column, 0
-      delete line_length
+      delete current_line.size
       if position == [0,0]
         delete(1)
       else
@@ -96,8 +96,8 @@ module Ruco
 
     protected
 
-    def line_length
-      lines[@line].size
+    def after_last_word
+      current_line.index(/\s*$/)
     end
 
     def position
@@ -105,7 +105,6 @@ module Ruco
     end
 
     def move_to_eol
-      after_last_word = current_line.index(/\s*$/)
       after_last_whitespace = current_line.size
 
       if @column == after_last_whitespace or @column < after_last_word
@@ -142,7 +141,7 @@ module Ruco
 
     def adjust_view
       @line =    [[@line,   0].max, lines.size - 1].min
-      @column =  [[@column, 0].max, (lines[@line]||'').size].min
+      @column =  [[@column, 0].max, current_line.size].min
       reposition_cursor
       scroll_column_into_view
       scroll_line_into_view

data/ruco.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.18"
+  s.version = "0.0.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

data/spec/ruco/application_spec.rb

@@ -125,13 +125,21 @@ describe Ruco::Application do
       editor_part(app.view).should == "    \n    a\n"
     end
 
-    it "indents when typing and the next line has more whitespace" do
+    it "indents when at end of line and the next line has more whitespace" do
       write("a\n  b\n")
       app.key(:right)
       app.key(:enter)
       app.key('c')
       editor_part(app.view).should == "a\n  c\n  b"
     end
+
+    it "does not indent when inside line and next line has more whitespace" do
+      write("ab\n  b\n")
+      app.key(:right)
+      app.key(:enter)
+      app.key('c')
+      editor_part(app.view).should == "a\ncb\n  b"
+    end
   end
 
   describe '.ruco.rb' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 19
+  version: 0.0.19
 platform: ruby
 authors: 
 - Michael Grosser