glimmer-cs-gladiator 0.3.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1111b445263923138023d8a6944c2e9e97acabee157bf51b3ebe6b198a082f1d
-  data.tar.gz: 9eb85280093b99e302eccfe2d5ca63728d52cf76c823917a5317fc6b0c2ad771
+  metadata.gz: 5b1fe5cc493fe6df44d316fe7e4fc9e19eb6e0f463724e5bbf1254fb35379463
+  data.tar.gz: eb399a865ec9e5ab6f4f269cf8c318f8931eda1e014ea557516cc30a979bb249
 SHA512:
-  metadata.gz: d3439fc60d40194cdf87431cdd886c43c16e75e0855040acd84017127b3f2b3f1d6a89b2b52bf9f69b39c7fc82defc87b499a14cdb1c19608f1765ebe6b12209
-  data.tar.gz: 4235750d7d134285f32e1b7961041232bfe8f31f9260836fbd067f1cc6fb81752d79f61bc5171bfe6da39d59fe6dd6ff96d65d87e88630156dc46f8ca5e8d699
+  metadata.gz: 2c20d228ba4421dc54f55206a9c75418c0fe6f1369f27984864c3b22620b42880670d9da3416d5db65e0d3a8028521bddd4f07747fd6cf9fb3a61aec23f617e1
+  data.tar.gz: 30bec26afe87951052c68b1bf2d6a1e4475d715d9de37664bdb3ecc36584ae363bb941152da4f268db8a119360c165e202ba36b998c6c6feb3df9bbf487ddcac

data/README.md

@@ -1,17 +1,18 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.3.0 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
+# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.5.1 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
 ## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer Custom Shell](https://github.com/AndyObtiva/glimmer-dsl-swt#custom-shell-gem)
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
 ![Gladiator](images/glimmer-gladiator.png)
 
-Gladiator (short for Glimmer Editor) is a [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) sample project under on-going development that demonstrates how to build a text editor in [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library).
+Gladiator (short for Glimmer Editor) is a [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) sample beta project under on-going development that demonstrates how to build a text editor in Ruby using [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library).
 It is not intended to be a full-fledged editor by any means, yet mostly a fun educational exercise in using [Glimmer](https://github.com/AndyObtiva/glimmer).
-Gladiator is also a personal tool for shaping an editor exactly the way I like, with all the keyboard shortcuts I prefer. 
+Gladiator is also a personal tool for shaping an editor exactly the way I like, with all the keyboard shortcuts I prefer.
 I leave building truly professional text editors to software tooling experts who would hopefully use [Glimmer](https://github.com/AndyObtiva/glimmer) one day. Otherwise, I have been happily using Gladiator to develop all my [open-source projects](https://github.com/AndyObtiva) since May of 2020.
 
 ## Features
 
 Gladiator currently supports the following text editing features (including keyboard shortcuts with Mac CMD=CTRL on Windows/Linux):
+- Ruby Syntax Highlighting with colors
 - File explorer navigation with context menu to open file, rename, delete, add new file, add new directory, or refresh tree (CMD+T)
 - File lookup by name ignoring slashes, underscores, and dots to ease lookup (CMD+R)
 - Watch open file for external changes to automatically refresh in editor
@@ -21,7 +22,7 @@ Gladiator currently supports the following text editing features (including keyb
 - Jump to Line (CMD+L)
 - Multiple tab support (CMD+SHIFT+[ & CMD+SHIFT+] for tab navigation. CMD+1-9 to jump to a specific tab)
 - Remember opened tabs, caret position, top line, window size, and window location
-- Autosave on focus out/quit/open new file 
+- Autosave on focus out/quit/open new file
 - Duplicate Line(s)/selection (CMD+D)
 - Kill Line(s)/selection (CMD+K)
 - Move line/selection up (CMD+UP)
@@ -30,12 +31,15 @@ Gladiator currently supports the following text editing features (including keyb
 - Indent/Unindent line/selection (CMD+] & CMD+[)
 - Insert/Prefix New Line (CMD+ENTER & CMD+SHIFT+ENTER)
 - Drag and Drop Text Editor Split Screen (drag a file from File Tree or File Lookup List, and it splits the screen)
+- Run Ruby code (CMD+SHIFT+R)
+- Scratchpad for running arbitrary Ruby/Glimmer code without saving to disk (CMD+SHIFT+S)
+- Change Split Orientation to Horizontal/Vertical via View Menu (CMD+SHIFT+O)
 
 ## Platforms
 
 - Mac: Gladiator works best on the Mac. This is the platform it is most used on and receives the most maintenance for.
-- Windows: Gladiator works OK on Windows, but has some annoying bugs.
-- Linux: Gladiator works with very bad handicaps on Linux (performing text editing operations causes scroll jitter)
+- Windows: Gladiator works OK on Windows, but has some annoying bugs. Contributers could help fix.
+- Linux: Gladiator works with handicaps on Linux (performing some text editing operations causes scroll jitter). Contributers could help fix.
 
 ## Pre-requisites
 
@@ -95,11 +99,11 @@ bin/gladiator relative-or-absolute-path/to/project
 
 ### Glimmer Custom Shell Reuse
 
-To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application, add the 
+To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application, add the
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '~> 0.3.0'
+gem 'glimmer-cs-gladiator', '~> 0.5.1'
 ```
 
 Run:
@@ -112,7 +116,7 @@ And, then instantiate the Gladiator [custom shell](https://github.com/AndyObtiva
 
 ## Env Var Options
 
-Gladiator opens with the current directory as the root by default. 
+Gladiator opens with the current directory as the root by default.
 If you would like to open another directory, set `LOCAL_DIR` environment variable.
 
 Example:
@@ -131,7 +135,9 @@ It currently remembers:
 - Last opened file
 - Caret position
 - Top line position
+- Window size
 - Opened tabs
+- Split tabs
 - Ignore Paths
 
 ## Gotcha

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.5.1

data/bin/gladiator_runner.rb

@@ -2,4 +2,5 @@ require_relative '../lib/glimmer-cs-gladiator'
 
 include Glimmer
 
-gladiator.open
+local_dir = ENV['LOCAL_DIR'] || '.'
+gladiator(project_dir_path: local_dir).open

data/lib/models/glimmer/gladiator/command.rb

@@ -1,7 +1,9 @@
 module Glimmer
   class Gladiator
-    class Command
+    class Command    
       class << self
+        include Glimmer
+        
         def command_history
           @command_history ||= {}
         end
@@ -11,7 +13,7 @@ module Glimmer
           command_history[file] ||= [Command.new(file)] 
         end
         
-        def do(file, method = nil, command: nil)
+        def do(file, method = nil, command: nil)        
           command ||= Command.new(file, method)
           command_history_for(file)&.last&.next_command = command
           command.do
@@ -20,11 +22,13 @@ module Glimmer
         
         def undo(file)
           return if command_history_for(file).size <= 1        
-          command_history_for(file).pop.undo
+          command = command_history_for(file).pop
+          command&.undo
         end
         
         def redo(file)
-          command_history_for(file).last&.redo
+          command = command_history_for(file).last
+          command&.redo
         end
       end
     

data/lib/models/glimmer/gladiator/dir.rb

@@ -4,39 +4,40 @@ module Glimmer
   class Gladiator
     class Dir
       include Glimmer
+      include Glimmer::DataBinding::ObservableModel
 
       REFRESH_DELAY = 7
   
-      class << self
-        def local_dir
-          unless @local_dir
-            @local_dir = new(ENV['LOCAL_DIR'] || '.', true)
-#             @local_dir.refresh
-            @filewatcher = Filewatcher.new(@local_dir.path)
-            @thread = Thread.new(@filewatcher) do |fw| 
-              fw.watch do |filename, event|
-                if @last_update.nil? || (Time.now.to_f - @last_update) > REFRESH_DELAY
-                  @local_dir.refresh if !filename.include?('new_file') && !@local_dir.selected_child_path_history.include?(filename) && filename != @local_dir.selected_child_path
-                end
-                @last_update = Time.now.to_f
-              end
-            end
-          end
-          @local_dir
-        end        
-      end
-  
       attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :display_path, :ignore_paths
-      attr_reader :name, :parent, :path, :is_local_dir
+      attr_reader :name, :parent, :path
       attr_writer :all_children
   
-      def initialize(path, is_local_dir = false)
-        @is_local_dir = is_local_dir
+      def initialize(path, project_dir = nil)
+        @project_dir = project_dir
+        if is_local_dir
+         @filewatcher = Filewatcher.new(path)
+         @thread = Thread.new(@filewatcher) do |fw|
+           fw.watch do |filename, event|
+             if @last_update.nil? || (Time.now.to_f - @last_update) > REFRESH_DELAY
+               refresh if !filename.include?('new_file') && !selected_child_path_history.include?(filename) && filename != selected_child_path
+             end
+             @last_update = Time.now.to_f
+           end
+         end
+        end
         self.path = ::File.expand_path(path)
         @name = ::File.basename(::File.expand_path(path))
-        @ignore_paths = ['packages', 'tmp']
+        @ignore_paths = ['.gladiator', '.git', 'coverage', 'packages', 'tmp', 'vendor']
         self.filtered_path_options = []
       end
+      
+      def is_local_dir
+        @project_dir.nil?
+      end
+
+      def project_dir
+        @project_dir || self
+      end
 
       def path=(the_path)
         @path = the_path
@@ -44,32 +45,24 @@ module Glimmer
       end
       
       def generate_display_path
-        is_local_dir ? path : @display_path = @path.sub(Dir.local_dir.path, '').sub(/^\//, '')
+        is_local_dir ? path : @display_path = @path.sub(project_dir.path, '').sub(/^\//, '')
       end
       
-      def name=(the_name)
-        self.display_path = display_path.sub(/#{Regexp.escape(@name)}$/, the_name)
-        @name = the_name
-        new_path = ::File.expand_path(display_path)
-        FileUtils.mv(path, new_path)
-        self.path = display_path
-      end
-  
       def children
         @children ||= retrieve_children
       end
 
       def retrieve_children
         @children = ::Dir.glob(::File.join(@path, '*')).reject do |p|
-          # TODO make sure to configure ignore_paths in a preferences dialog 
-          Dir.local_dir.ignore_paths.reduce(false) do |result, ignore_path|
+          # TODO make sure to configure ignore_paths in a preferences dialog
+          project_dir.ignore_paths.reduce(false) do |result, ignore_path|
             result || p.include?(ignore_path)
           end
-        end.map do |p| 
-          ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)
-        end.sort_by do |c| 
-          c.path.to_s.downcase 
-        end.sort_by do |c| 
+        end.map do |p|
+          ::File.file?(p) ? Gladiator::File.new(p, project_dir) : Gladiator::Dir.new(p, project_dir)
+        end.sort_by do |c|
+          c.path.to_s.downcase
+        end.sort_by do |c|
           c.class.name
         end.each do |child|
           child.retrieve_children if child.is_a?(Dir)
@@ -105,7 +98,7 @@ module Glimmer
   
       def filter=(value)
         if value.to_s.empty?
-          @filter = nil 
+          @filter = nil
         else
           @filter = value
         end
@@ -117,8 +110,8 @@ module Glimmer
       def filtered
         return if filter.nil?
         children_files = !@last_filter.to_s.empty? && filter.downcase.start_with?(@last_filter.downcase) ? @last_filtered : all_children_files
-        children_files.select do |child| 
-          child_path = child.path.to_s.sub(Dir.local_dir.path, '')
+        children_files.select do |child|
+          child_path = child.path.to_s.sub(project_dir.path, '')
           child_path.downcase.include?(filter.downcase) ||
             child_path.downcase.gsub(/[_\/.-]/, '').include?(filter.downcase.gsub(/[_\/.-]/, ''))
         end.sort_by {|c| c.path.to_s.downcase}
@@ -141,14 +134,19 @@ module Glimmer
       end
   
       def selected_child_path=(selected_path)
-        full_selected_path = selected_path.include?(Dir.local_dir.path) ? selected_path : ::File.join(Dir.local_dir.path, selected_path)
-        return if selected_path.nil? || 
-                  ::Dir.exist?(full_selected_path) || 
+        return (project_dir.selected_child = nil) if selected_path.nil?
+        # scratchpad scenario
+        if selected_path.empty? #scratchpad
+          @selected_child&.write_dirty_content
+          return (self.selected_child = File.new)
+        end
+        full_selected_path = selected_path.include?(project_dir.path) ? selected_path : ::File.join(project_dir.path, selected_path)
+        return if ::Dir.exist?(full_selected_path) ||
                   (selected_child && selected_child.path == full_selected_path)
         selected_path = full_selected_path
         if ::File.file?(selected_path)
           @selected_child&.write_dirty_content
-          new_child = Gladiator::File.new(selected_path)
+          new_child = Gladiator::File.new(selected_path, project_dir)
           begin
             unless new_child.dirty_content.nil?
               self.selected_child&.stop_filewatcher
@@ -168,6 +166,12 @@ module Glimmer
         @selected_child&.path
       end
       
+      def selected_child=(new_child)
+        file_properties = @selected_child&.backup_properties if @selected_child == new_child
+        @selected_child = new_child
+        @selected_child.restore_properties(file_properties) if file_properties
+      end
+      
       def delete!
         FileUtils.rm_rf(path)
       end
@@ -183,11 +187,7 @@ module Glimmer
       def hash
         self.path.hash
       end
-    end  
+    end
   end
 end
-
-at_exit do
-  Glimmer::Gladiator::Dir.local_dir.selected_child&.write_raw_dirty_content
-end
   

data/lib/models/glimmer/gladiator/file.rb

@@ -1,22 +1,21 @@
-require 'models/glimmer/gladiator/dir'
-
 module Glimmer
   class Gladiator
     class File
       include Glimmer
-  
-      attr_accessor :dirty_content, :line_numbers_content, :selection, :selection_count, :line_number, :find_text, :replace_text, :top_index, :display_path, :case_sensitive
-      attr_reader :name, :path
-  
-      def initialize(path)
-        raise "Not a file path: #{path}" unless ::File.file?(path)
+
+      attr_accessor :dirty_content, :line_numbers_content, :selection, :line_number, :find_text, :replace_text, :top_pixel, :display_path, :case_sensitive
+      attr_reader :name, :path, :project_dir
+
+      def initialize(path='', project_dir=nil)
+        raise "Not a file path: #{path}" if path.nil? || (!path.empty? && !::File.file?(path))
+        @project_dir = project_dir
         @command_history = []
-        @name = ::File.basename(path)
-        self.path = ::File.expand_path(path)
-        @top_index = 0
+        @name = path.empty? ? 'Scratchpad' : ::File.basename(path)
+        self.path = ::File.expand_path(path) unless path.empty?
+        @top_pixel = 0
         @selection_count = 0
         @selection = Point.new(0, 0 + @selection_count)
-        read_dirty_content = ::File.read(path)
+        read_dirty_content = path.empty? ? '' : ::File.read(path)
         begin
           # test read dirty content
           read_dirty_content.split("\n")
@@ -40,20 +39,41 @@ module Glimmer
           # no op in case of a binary file
         end
       end
-      
+
       def path=(the_path)
         @path = the_path
         generate_display_path
       end
-      
+
       def generate_display_path
-        @display_path = @path.sub(Dir.local_dir.path, '').sub(/^\//, '')      
+        return if @path.empty?
+        @display_path = @path.sub(project_dir.path, '').sub(/^\//, '')
       end
       
+      def scratchpad?
+        path.empty?
+      end
+
+      def backup_properties
+        [:find_text, :replace_text, :case_sensitive, :top_pixel, :caret_position, :selection_count].reduce({}) do |hash, property|
+          hash.merge(property => send(property))
+        end
+      end
+
+      def restore_properties(properties_hash)
+        return if properties_hash[:caret_position] == 0 && properties_hash[:selection_count] == 0 && properties_hash[:find_text].nil? && properties_hash[:replace_text].nil? && properties_hash[:top_pixel] == 0 && properties_hash[:case_sensitive].nil?
+        properties_hash.each do |property, value|
+          send("#{property}=", value)
+        end
+      end
+
       # to use for widget data-binding
       def content=(value)
-        Command.do(self) # record a native (OS-widget) operation
-        self.dirty_content = value
+        value = value.gsub("\t", '  ')
+        if dirty_content != value
+          Command.do(self) # record a native (OS-widget) operation
+          self.dirty_content = value
+        end
       end
 
       def content
@@ -61,35 +81,32 @@ module Glimmer
       end
 
       def caret_position=(value)
+        old_top_pixel = top_pixel
         self.selection = Point.new(value, value + selection_count.to_i)
-        if OS.linux?
-          async_exec do
-            self.top_index = line_index_for_caret_position(value)
-          end
-        end
+        self.top_pixel = old_top_pixel
       end
-      
+
       def caret_position
         selection.x
       end
-      
-      def name=(the_name)
-        new_path = path.sub(/#{Regexp.escape(@name)}$/, the_name)
-        @name = the_name
-        if ::File.exists?(path)
-          FileUtils.mv(path, new_path)
-          self.path = new_path
-        end
+
+      def selection_count
+        selection.y - selection.x
       end
-      
+
+      def selection_count=(value)
+        self.selection = Point.new(caret_position, caret_position + value.to_i)
+      end
+
       def dirty_content=(the_content)
-        @dirty_content = the_content if ::File.exist?(path)
+        @dirty_content = the_content
         notify_observers(:content)
       end
-  
+
       def start_filewatcher
+        return if scratchpad?
         @filewatcher = Filewatcher.new(@path)
-        @thread = Thread.new(@filewatcher) do |fw| 
+        @thread = Thread.new(@filewatcher) do |fw|
           fw.watch do |filename, event|
             begin
               read_dirty_content = ::File.read(path)
@@ -104,27 +121,28 @@ module Glimmer
           end
         end
       end
-      
+
       def stop_filewatcher
         @filewatcher&.stop
       end
 
       def format_dirty_content_for_writing!
-        new_dirty_content = "#{dirty_content.gsub("\r\n", "\n").gsub("\r", "\n").sub(/\n+\z/, '')}\n"      
+        new_dirty_content = dirty_content.split("\n").map {|line| line.strip.empty? ? line : line.rstrip }.join("\n")
+        new_dirty_content = "#{new_dirty_content.gsub("\r\n", "\n").gsub("\r", "\n").sub(/\n+\z/, '')}\n"
         self.dirty_content = new_dirty_content if new_dirty_content != self.dirty_content
       end
-  
+
       def write_dirty_content
-        return unless ::File.exist?(path)
+        return if scratchpad? || !::File.exist?(path)
         format_dirty_content_for_writing!
         ::File.write(path, dirty_content) if ::File.exists?(path)
       rescue => e
         puts "Error in writing dirty content for #{path}"
         puts e.full_message
       end
-  
+
       def write_raw_dirty_content
-        return unless ::File.exist?(path)
+        return if scratchpad? || !::File.exist?(path)
         ::File.write(path, dirty_content) if ::File.exists?(path)
       rescue => e
         puts "Error in writing raw dirty content for #{path}"
@@ -138,16 +156,17 @@ module Glimmer
       def current_line
         lines[line_number - 1]
       end
-      
+
       def delete!
-        FileUtils.rm(path)        
+        FileUtils.rm(path) unless scratchpad?
       end
-      
+
       def prefix_new_line!
         the_lines = lines
         the_lines[line_number-1...line_number-1] = [current_line_indentation]
         self.dirty_content = the_lines.join("\n")
         self.caret_position = caret_position_for_line_index(line_number-1) + current_line_indentation.size
+        self.selection_count = 0
       end
 
       def insert_new_line!
@@ -155,6 +174,7 @@ module Glimmer
         the_lines[line_number...line_number] = [current_line_indentation]
         self.dirty_content = the_lines.join("\n")
         self.caret_position = caret_position_for_line_index(line_number) + current_line_indentation.size
+        self.selection_count = 0
       end
 
       def comment_line!
@@ -182,7 +202,7 @@ module Glimmer
             delta += 2
           end
         end
-        self.dirty_content = new_lines.join("\n")   
+        self.dirty_content = new_lines.join("\n")
         if old_selection_count.to_i > 0
           self.caret_position = caret_position_for_line_index(old_caret_position_line_index)
           self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
@@ -192,7 +212,7 @@ module Glimmer
           self.caret_position = new_caret_position
         end
       end
-  
+
       def indent!
         new_lines = lines
         old_lines = lines
@@ -208,7 +228,7 @@ module Glimmer
           new_lines[the_line_index] = "  #{the_line}"
         end
         old_caret_position = self.caret_position
-        self.dirty_content = new_lines.join("\n")   
+        self.dirty_content = new_lines.join("\n")
         if old_selection_count.to_i > 0
           self.caret_position = caret_position_for_line_index(old_caret_position_line_index)
           self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
@@ -216,7 +236,7 @@ module Glimmer
           self.caret_position = old_caret_position + delta
         end
       end
-  
+
       def outdent!
         new_lines = lines
         old_lines = lines
@@ -237,7 +257,7 @@ module Glimmer
             delta = -1
           end
         end
-        self.dirty_content = new_lines.join("\n")   
+        self.dirty_content = new_lines.join("\n")
         if old_selection_count.to_i > 0
           self.caret_position = caret_position_for_line_index(old_caret_position_line_index)
           self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
@@ -247,7 +267,7 @@ module Glimmer
           self.caret_position = new_caret_position
         end
       end
-  
+
       def kill_line!
         new_lines = lines
         return if new_lines.size < 1
@@ -260,7 +280,7 @@ module Glimmer
         self.caret_position = caret_position_for_line_index(old_line_index) + [line_position, lines[old_line_index].to_s.size].min
         self.selection_count = 0
       end
-  
+
       def duplicate_line!
         new_lines = lines
         old_lines = lines
@@ -284,13 +304,13 @@ module Glimmer
           self.caret_position = old_caret_position + delta
         end
       end
-  
+
       def find_next
-        return if find_text.to_s.empty?        
+        return if find_text.to_s.empty?
         all_lines = lines
         the_line_index = line_index_for_caret_position(caret_position)
         line_position = line_position_for_caret_position(caret_position)
-        found = 
+        found = found_text?(caret_position)
         2.times do |i|
           rotation = the_line_index
           all_lines.rotate(rotation).each_with_index do |the_line, the_index|
@@ -307,7 +327,7 @@ module Glimmer
           end
         end
       end
-  
+
       def find_previous
         return if find_text.to_s.empty?
         all_lines = lines
@@ -332,7 +352,7 @@ module Glimmer
           end
         end
       end
-  
+
       def ensure_find_next
         return if find_text.to_s.empty? || dirty_content.to_s.strip.size < 1
         find_next unless found_text?(self.caret_position)
@@ -341,7 +361,7 @@ module Glimmer
       def found_text?(caret_position)
         dirty_content[caret_position.to_i, find_text.to_s.size].to_s.downcase == find_text.to_s.downcase
       end
-  
+
       def replace_next!
         return if find_text.to_s.empty? || dirty_content.to_s.strip.size < 1
         ensure_find_next
@@ -349,28 +369,37 @@ module Glimmer
         new_dirty_content[caret_position, find_text.size] = replace_text.to_s
         self.dirty_content = new_dirty_content
         find_next
+        find_next if replace_text.to_s.include?(find_text) && !replace_text.to_s.start_with?(find_text)
       end
-  
+      
       def page_up
         self.selection_count = 0
         self.line_number = [(self.line_number - 15), 1].max
       end
-  
+
       def page_down
         self.selection_count = 0
         self.line_number = [(self.line_number + 15), lines.size].min
       end
-  
+
       def home
         self.selection_count = 0
         self.line_number = 1
       end
-  
+
       def end
         self.selection_count = 0
         self.line_number = lines.size
       end
-  
+
+      def start_of_line
+        self.caret_position = caret_position_for_line_index(self.line_number - 1)
+      end
+
+      def end_of_line
+        self.caret_position = caret_position_for_line_index(self.line_number) - 1
+      end
+
       def move_up!
         old_lines = lines
         return if old_lines.size < 2
@@ -389,7 +418,7 @@ module Glimmer
         self.caret_position = caret_position_for_line_index(new_line_index) + [old_caret_position_line_position, new_lines[new_line_index].size].min
         self.selection_count = old_selection_count.to_i if old_selection_count.to_i > 0
       end
-  
+
       def move_down!
         old_lines = lines
         return if old_lines.size < 2
@@ -408,25 +437,38 @@ module Glimmer
         self.caret_position = caret_position_for_line_index(new_line_index) + [old_caret_position_line_position, new_lines[new_line_index].size].min
         self.selection_count = old_selection_count.to_i if old_selection_count.to_i > 0
       end
-  
+      
+      def run
+        begin
+          if scratchpad?
+            eval content
+          else
+            write_dirty_content
+            load path
+          end
+        rescue SyntaxError, StandardError => e
+          puts e.full_message
+        end
+      end
+
       def lines
         dirty_content.split("\n")
       end
-  
+
       def line_for_caret_position(caret_position)
         lines[line_index_for_caret_position(caret_position.to_i)]
       end
-  
+
       def line_index_for_caret_position(caret_position)
         dirty_content[0...caret_position.to_i].count("\n")
       end
-  
+
       def caret_position_for_line_index(line_index)
         cp = lines[0...line_index].join("\n").size
         cp += 1 if line_index > 0
         cp
       end
-  
+
       def caret_position_for_caret_position_start_of_line(caret_position)
         caret_position_for_line_index(line_index_for_caret_position(caret_position))
       end
@@ -437,23 +479,23 @@ module Glimmer
         caret_position = caret_position.to_i
         caret_position - caret_position_for_caret_position_start_of_line(caret_position)
       end
-  
+
       def line_caret_positions_for_selection(caret_position, selection_count)
         line_indices = line_indices_for_selection(caret_position, selection_count)
         line_caret_positions = line_indices.map { |line_index| caret_position_for_line_index(line_index) }.to_a
       end
-  
+
       def end_caret_position_line_index(caret_position, selection_count)
         end_caret_position = caret_position + selection_count.to_i
         end_caret_position -= 1 if dirty_content[end_caret_position - 1] == "\n"
         end_line_index = line_index_for_caret_position(end_caret_position)
       end
-  
+
       def lines_for_selection(caret_position, selection_count)
         line_indices = line_indices_for_selection(caret_position, selection_count)
         lines[line_indices.first..line_indices.last]
       end
-  
+
       def line_indices_for_selection(caret_position, selection_count)
         start_line_index = line_index_for_caret_position(caret_position)
         if selection_count.to_i > 0
@@ -463,22 +505,22 @@ module Glimmer
         end
         (start_line_index..end_line_index).to_a
       end
-  
+
       def children
         []
       end
-  
+
       def to_s
         path
       end
-      
+
       def eql?(other)
         self.path.eql?(other&.path)
       end
-      
+
       def hash
         self.path.hash
       end
-    end  
+    end
   end
 end