diakonos 0.8.8 → 0.9.8

data/lib/diakonos/buffer/cursor.rb

@@ -0,0 +1,335 @@
+module Diakonos
+
+  class Buffer
+
+    attr_reader :last_col, :last_row, :last_screen_x, :last_screen_y, :last_screen_col
+
+    # Returns true iff the cursor changed positions in the buffer.
+    def cursor_to( row, col, do_display = DONT_DISPLAY, stopped_typing = STOPPED_TYPING, adjust_row = ADJUST_ROW )
+      old_last_row = @last_row
+      old_last_col = @last_col
+
+      row = NumberFitter.fit(
+        number: row,
+        min: 0,
+        max: @lines.length - 1,
+      )
+
+      if col < 0
+        if adjust_row
+          if row > 0
+            row = row - 1
+            col = @lines[ row ].length
+          else
+            col = 0
+          end
+        else
+          col = 0
+        end
+      elsif col > @lines[ row ].length
+        if adjust_row
+          if row < @lines.length - 1
+            row = row + 1
+            col = 0
+          else
+            col = @lines[ row ].length
+          end
+        else
+          col = @lines[ row ].length
+        end
+      end
+
+      if adjust_row
+        @desired_column = col
+      else
+        goto_col = [ @desired_column, @lines[ row ].length ].min
+        if col < goto_col
+          col = goto_col
+        end
+      end
+
+      new_col = tab_expanded_column( col, row )
+      view_changed = show_character( row, new_col )
+      @last_screen_y = row - @top_line
+      @last_screen_x = new_col - @left_column
+
+      @typing = false  if stopped_typing
+      @last_row = row
+      @last_col = col
+      @last_screen_col = new_col
+
+      record_mark_start_and_end
+
+      selection_removed = false
+      if ! @auto_anchored && ! @changing_selection && selecting?
+        remove_selection( DONT_DISPLAY )
+        selection_removed = true
+      end
+      @auto_anchored = false
+
+      old_pair = @text_marks[ :pair ]
+      if @settings[ 'view.pairs.highlight' ]
+        highlight_pair
+      elsif old_pair
+        clear_pair_highlight
+      end
+      highlight_changed = old_pair != @text_marks[ :pair ]
+
+      if selection_removed || ( do_display && ( selecting? || view_changed || highlight_changed ) )
+        display
+      else
+        $diakonos.display_mutex.synchronize do
+          @win_main.setpos( @last_screen_y, @last_screen_x )
+        end
+      end
+      $diakonos.update_status_line
+      $diakonos.update_context_line
+
+      ( @last_row != old_last_row || @last_col != old_last_col )
+    end
+
+    def cursor_to_eof
+      cursor_to( @lines.length - 1, @lines[ -1 ].length, DO_DISPLAY )
+    end
+
+    def cursor_to_bol
+      row = @last_row
+      case @settings[ "bol_behaviour" ]
+      when BOL_ZERO
+        col = 0
+      when BOL_FIRST_CHAR
+        col = ( ( @lines[ row ] =~ /\S/ ) || 0 )
+      when BOL_ALT_ZERO
+        if @last_col == 0
+          col = ( @lines[ row ] =~ /\S/ )
+        else
+          col = 0
+        end
+        #when BOL_ALT_FIRST_CHAR
+      else
+        first_char_col = ( ( @lines[ row ] =~ /\S/ ) || 0 )
+        if @last_col == first_char_col
+          col = 0
+        else
+          col = first_char_col
+        end
+      end
+      cursor_to( row, col, DO_DISPLAY )
+    end
+
+    def cursor_to_eol
+      y = @win_main.cury
+      end_col = line_at( y ).length
+      last_char_col = line_at( y ).rstrip.length
+      case @settings[ 'eol_behaviour' ]
+      when EOL_END
+        col = end_col
+      when EOL_LAST_CHAR
+        col = last_char_col
+      when EOL_ALT_LAST_CHAR
+        if @last_col == last_char_col
+          col = end_col
+        else
+          col = last_char_col
+        end
+      else
+        if @last_col == end_col
+          col = last_char_col
+        else
+          col = end_col
+        end
+      end
+      cursor_to( @last_row, col, DO_DISPLAY )
+    end
+
+    # Top of view
+    def cursor_to_tov
+      cursor_to( row_of( 0 ), @last_col, DO_DISPLAY )
+    end
+    # Bottom of view
+    def cursor_to_bov
+      cursor_to( row_of( 0 + $diakonos.main_window_height - 1 ), @last_col, DO_DISPLAY )
+    end
+
+    # col and row are given relative to the buffer, not any window or screen.
+    # Returns true if the view changed positions.
+    def show_character( row, col )
+      old_top_line = @top_line
+      old_left_column = @left_column
+
+      while row < @top_line + @settings[ "view.margin.y" ]
+        amount = (-1) * @settings[ "view.jump.y" ]
+        break if( pitch_view( amount, DONT_PITCH_CURSOR, DONT_DISPLAY ) != amount )
+      end
+      while row > @top_line + $diakonos.main_window_height - 1 - @settings[ "view.margin.y" ]
+        amount = @settings[ "view.jump.y" ]
+        break if( pitch_view( amount, DONT_PITCH_CURSOR, DONT_DISPLAY ) != amount )
+      end
+
+      while col < @left_column + @settings[ "view.margin.x" ]
+        amount = (-1) * @settings[ "view.jump.x" ]
+        break if( pan_view( amount, DONT_DISPLAY ) != amount )
+      end
+      while col > @left_column + $diakonos.main_window_width - @settings[ "view.margin.x" ] - 2
+        amount = @settings[ "view.jump.x" ]
+        break if( pan_view( amount, DONT_DISPLAY ) != amount )
+      end
+
+      @top_line != old_top_line || @left_column != old_left_column
+    end
+
+    def go_to_line( line = nil, column = nil, do_display = DO_DISPLAY )
+      cursor_to( line || @last_row, column || 0, do_display )
+    end
+
+    def go_block_outer
+      initial_level = indentation_level( @last_row )
+      new_row = @last_row
+      passed = false
+      new_level = initial_level
+      ( 0...@last_row ).reverse_each do |row|
+        next  if @lines[ row ].strip.empty?
+        level = indentation_level( row )
+        if ! passed
+          passed = ( level < initial_level )
+          new_level = level
+        else
+          if level < new_level
+            new_row = ( row+1..@last_row ).find { |r|
+              ! @lines[ r ].strip.empty?
+            }
+            break
+          end
+        end
+      end
+      go_to_line( new_row, @lines[ new_row ].index( /\S/ ) )
+    end
+
+    def go_block_inner
+      initial_level = indentation_level( @last_row )
+      new_row = @lines.length
+      ( @last_row...@lines.length ).each do |row|
+        next  if @lines[ row ].strip.empty?
+        level = indentation_level( row )
+        if level > initial_level
+          new_row = row
+          break
+        elsif level < initial_level
+          new_row = @last_row
+          break
+        end
+      end
+      go_to_line( new_row, @lines[ new_row ].index( /\S/ ) )
+    end
+
+    def go_block_next
+      initial_level = indentation_level( @last_row )
+      new_row = @last_row
+      passed = false
+      ( @last_row+1...@lines.length ).each do |row|
+        next  if @lines[ row ].strip.empty?
+        level = indentation_level( row )
+        if ! passed
+          if level < initial_level
+            passed = true
+          end
+        else
+          if level == initial_level
+            new_row = row
+            break
+          elsif level < initial_level - 1
+            break
+          end
+        end
+      end
+      go_to_line( new_row, @lines[ new_row ].index( /\S/ ) )
+    end
+
+    def go_block_previous
+      initial_level = indentation_level( @last_row )
+      new_row = @last_row
+      passed = false   # search for unindent
+      passed2 = false  # search for reindent
+      ( 0...@last_row ).reverse_each do |row|
+        next  if @lines[ row ].strip.empty?
+        level = indentation_level( row )
+        if ! passed
+          if level < initial_level
+            passed = true
+          end
+        else
+          if ! passed2
+            if level >= initial_level
+              new_row = row
+              passed2 = true
+            elsif level <= initial_level - 2
+              # No previous block
+              break
+            end
+          else
+            if level < initial_level
+              new_row = ( row+1..@last_row ).find { |r|
+                ! @lines[ r ].strip.empty?
+              }
+              break
+            end
+          end
+        end
+      end
+      go_to_line( new_row, @lines[ new_row ].index( /\S/ ) )
+    end
+
+    def go_to_char( char, after = ON_CHAR )
+      r = @last_row
+      i = @lines[ r ].index( char, @last_col + 1 )
+      if i
+        if after
+          i += 1
+        end
+        return cursor_to r, i, DO_DISPLAY
+      end
+
+      loop do
+        r += 1
+        break  if r >= @lines.size
+
+        i = @lines[ r ].index( char )
+        if i
+          if after
+            i += 1
+          end
+          return cursor_to r, i, DO_DISPLAY
+        end
+      end
+    end
+
+    def go_to_char_previous( char, after = ON_CHAR )
+      r = @last_row
+      search_from = @last_col - 1
+      if search_from >= 0
+        i = @lines[ r ].rindex( char, search_from )
+        if i
+          if after
+            i += 1
+          end
+          return cursor_to r, i, DO_DISPLAY
+        end
+      end
+
+      loop do
+        r -= 1
+        break  if r < 0
+
+        i = @lines[ r ].rindex( char )
+        if i
+          if after
+            i += 1
+          end
+          return cursor_to r, i, DO_DISPLAY
+        end
+      end
+    end
+
+  end
+
+end

data/lib/diakonos/buffer/delete.rb

@@ -0,0 +1,170 @@
+module Diakonos
+
+  class Buffer
+
+    # x and y are given window-relative, not buffer-relative.
+    def delete
+      if selection_mark
+        delete_selection
+      else
+        row = @last_row
+        col = @last_col
+        if ( row >= 0 ) && ( col >= 0 )
+          line = @lines[ row ]
+          if col == line.length
+            if row < @lines.length - 1
+              # Delete newline, and concat next line
+              join_lines( row )
+              cursor_to( @last_row, @last_col )
+            end
+          else
+            take_snapshot( TYPING )
+            @lines[ row ] = line[ 0...col ] + line[ (col + 1)..-1 ]
+            set_modified
+          end
+        end
+      end
+    end
+
+    def delete_line
+      remove_selection( DONT_DISPLAY )  if selection_mark
+
+      row = @last_row
+      take_snapshot
+      retval = nil
+      if @lines.length == 1
+        retval = @lines[ 0 ]
+        @lines[ 0 ] = ""
+      else
+        retval = @lines[ row ]
+        @lines.delete_at row
+      end
+      cursor_to( row, 0 )
+      set_modified
+
+      retval
+    end
+
+    def delete_to_eol
+      remove_selection( DONT_DISPLAY )  if selection_mark
+
+      row = @last_row
+      col = @last_col
+
+      take_snapshot
+      if @settings[ 'delete_newline_on_delete_to_eol' ] && col == @lines[ row ].size
+        next_line = @lines.delete_at( row + 1 )
+        @lines[ row ] << next_line
+        retval = [ "\n" ]
+      else
+        retval = [ @lines[ row ][ col..-1 ] ]
+        @lines[ row ] = @lines[ row ][ 0...col ]
+      end
+      set_modified
+
+      retval
+    end
+
+    def delete_from_to( row_from, col_from, row_to, col_to )
+      take_snapshot
+      if row_to == row_from
+        retval = [ @lines[ row_to ].slice!( col_from, col_to - col_from ) ]
+      else
+        pre_head = @lines[ row_from ][ 0...col_from ]
+        post_tail = @lines[ row_to ][ col_to..-1 ]
+        head = @lines[ row_from ].slice!( col_from..-1 )
+        tail = @lines[ row_to ].slice!( 0...col_to )
+        retval = [ head ] + @lines.slice!( row_from + 1, row_to - row_from ) + [ tail ]
+        @lines[ row_from ] = pre_head + post_tail
+      end
+      set_modified
+      retval
+    end
+
+    def delete_to( char )
+      remove_selection( DONT_DISPLAY )  if selection_mark
+
+      first_row = row = @last_row
+      index = @lines[ @last_row ].index( char, @last_col+1 )
+
+      while row < @lines.length - 1 && index.nil?
+        row += 1
+        index = @lines[ row ].index( char )
+      end
+
+      if index
+        delete_from_to( first_row, @last_col, row, index )
+      end
+    end
+
+    def delete_from( char )
+      remove_selection( DONT_DISPLAY )  if selection_mark
+
+      first_row = row = @last_row
+      index = @lines[ @last_row ].rindex( char, @last_col-1 )
+
+      while row > 0 && index.nil?
+        row -= 1
+        index = @lines[ row ].rindex( char )
+      end
+
+      if index
+        deleted_text = delete_from_to( row, index+1, first_row, @last_col )
+        cursor_to( row, index+1 )
+        deleted_text
+      end
+    end
+
+    def delete_to_and_from( char, inclusive = NOT_INCLUSIVE )
+      remove_selection( DONT_DISPLAY )  if selection_mark
+
+      start_char = end_char = char
+      case char
+        when '('
+          end_char = ')'
+        when '{'
+          end_char = '}'
+        when '['
+          end_char = ']'
+        when '<'
+          end_char = '>'
+        when ')'
+          end_char = '('
+        when '}'
+          end_char = '{'
+        when ']'
+          end_char = '['
+        when '>'
+          end_char = '<'
+      end
+
+      row = @last_row
+      start_index = @lines[ @last_row ].rindex( start_char, @last_col )
+      while row > 0 && start_index.nil?
+        row -= 1
+        start_index = @lines[ row ].rindex( start_char )
+      end
+      start_row = row
+
+      row = @last_row
+      end_index = @lines[ row ].index( end_char, @last_col+1 )
+      while row < @lines.length - 1 && end_index.nil?
+        row += 1
+        end_index = @lines[ row ].index( end_char )
+      end
+      end_row = row
+
+      if start_index && end_index
+        if inclusive
+          end_index += 1
+        else
+          start_index += 1
+        end
+        cursor_to( start_row, start_index )
+        delete_from_to( start_row, start_index, end_row, end_index )
+      end
+    end
+
+  end
+
+end