glimmer-cs-gladiator 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb031342309fc665039e7a7a64e4a3996f3e659a17767527d47da00e5d7ede50
-  data.tar.gz: 434912cc7be89f07d1e14cdf94ff1511ea7c6ca8e5b09d19654850c3680cb443
+  metadata.gz: 686df61b4e15ac85a1cc5d08cb3e83f088bce3a40b2a6e155101f657189075f3
+  data.tar.gz: 12874887ef0d8a846ef43d5eb89ad2d1ec184fe3d0171a4cf692a1f9348efe61
 SHA512:
-  metadata.gz: 6c594f90f5643023e7424747b9abd1959778c9d8d878a99e6b577f7f94e796f5c930c68eccfe267b84860f330cc0ca3004db784fbd6e59f73d62abe41988a6d9
-  data.tar.gz: db5c00808053ba03f441fc3fdf9d00afd627cc688cb8baa036fe749a679eba34628dd5dd629d7d20ef56614f2429bdce0918c7f294cf10fec611e74b20251923
+  metadata.gz: 8816804e0a23b860d98b6f583dba265cafac70ce3960b297f5c99dfa6de27d55441c5f959378d4851901e7cf059ec565bdbfc5911c114e8f41e250191f4b27fb
+  data.tar.gz: 288eccb3f7edbd055d54c0f05d9878a1630c057ca1f7464f7ecb586e5a632d33466197511f0e564900816dbb0b76b3a86ddc743d0fb0d60763a776ef592eb9d2

data/README.md

@@ -1,28 +1,24 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.5.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.6.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/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 Ruby using [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.
 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
-- Watch project subdirectories for changes to automatically refresh in file explorer/file lookup
-- Find & Replace (CMD+F)
+Gladiator currently supports the following text editing features (including keyboard shortcuts with Mac CMD=CTRL on Windows/Linux)
+
+### Text Editor
+
+- Text Editor with Colored Ruby Syntax Highlighting
 - Show Line Numbers
-- 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
+- Multi-tab support (CMD+SHIFT+[ & CMD+SHIFT+] for tab navigation. CMD+1-9 to jump to a specific tab)
+- Drag and drop split pane (drag a file from File Tree or File Lookup List, and it splits the pane)
 - Duplicate Line(s)/selection (CMD+D)
 - Kill Line(s)/selection (CMD+K)
 - Move line/selection up (CMD+UP)
@@ -30,10 +26,41 @@ Gladiator currently supports the following text editing features (including keyb
 - Comment/Uncomment line/selection (CMD+/)
 - 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)
+
+### File Explorer Tree
+
+- Collapsable file explorer tree listing files and directories for open project
+- Context menu to open file, rename, delete, add new file, add new directory, and refresh tree
+- Jump to open file in tree (CMD+T)
+
+### File Lookup List Filter
+
+- Collapsable file lookup list filter (CMD+R)
+- Semi-fuzzy filtering by ignoring slashes, underscores, and dots to ease lookup 
+
+### Navigation Area
+
+- Show current text editor file name
+- Show file navigation stats (Caret Position / Line Position / Selection Count / Top Pixel)
+- Jump to Line (CMD+L)
+- Find & Replace (CMD+F)
+
+### Menus
+
+- File Menu to Open Project (CMD+SHIFT+P) and open Scratchpad for running arbitrary Ruby/Glimmer code without saving to disk (CMD+SHIFT+S)
+- View Menu to Split Pane & Change Split Orientation to Horizontal/Vertical (CMD+SHIFT+O)
+- Run Menu to run Ruby code (CMD+SHIFT+R)
+
+### Watch External Changes
+
+- Watch open file for external changes to automatically refresh in editor
+- Watch project subdirectories for changes to automatically refresh in file explorer/file lookup
+
+### Automatic Data Management
+
+- Autosave on focus out/quit/open new file
+- Remember opened tabs, caret position, top pixel, window size, and window location
+- [Default](#configuration) "ignore paths" to avoid bogging down editor with irrelevant directory files
 
 ## Platforms
 
@@ -77,6 +104,12 @@ You may run the `gladiator` command to bring up the text editor in the project d
 gladiator
 ```
 
+On Linux, you may need to run with extra memory via this command instead:
+
+```
+gladiator -J-Xmx1200M
+```
+
 On Windows, you may need to run with extra memory via this command instead:
 
 ```
@@ -103,7 +136,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '~> 0.5.0'
+gem 'glimmer-cs-gladiator', '~> 0.6.0'
 ```
 
 Run:
@@ -129,16 +162,12 @@ Opens Gladiator with "/Users/User/code" as the root directory.
 
 ## Configuration
 
-Gladiator automatically saves configuration data in a `.gladiator` file at the directory it is run from.
+Gladiator automatically saves configuration data in a `.gladiator` file at the directory it is run from. It may be edited to add extra ignore paths.
 
 It currently remembers:
-- Last opened file
-- Caret position
-- Top line position
-- Window size
-- Opened tabs
-- Split tabs
-- Ignore Paths
+- Last opened files (in both split panes if split)
+- Window size and position
+- Ignore Paths (default: '.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor')
 
 ## Gotcha
 
@@ -173,4 +202,4 @@ Copyright (c) 2020 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for further detail
 
 [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 />](https://github.com/AndyObtiva/glimmer) Built with [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library)
 
-Gladiator icon made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a>
+Gladiator icon made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a>

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/glimmer-cs-gladiator.rb

@@ -23,7 +23,7 @@ module Glimmer
         args = SWTProxy.constantify_args(args)
         @swt_layout = self.class.swt_layout_class_for(underscored_layout_name).new(*args)
         @widget_proxy.swt_widget.setLayout(@swt_layout)
-      end    
+      end
     end
   end
 end

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

@@ -1,6 +1,8 @@
 module Glimmer
   class Gladiator
-    class Command    
+    class Command
+      include Glimmer
+      
       class << self
         include Glimmer
         
@@ -10,18 +12,25 @@ module Glimmer
         
         def command_history_for(file)
           # keeping a first command to make redo support work by remembering next command after undoing all
-          command_history[file] ||= [Command.new(file)] 
+          command_history[file] ||= [Command.new(file)]
         end
         
-        def do(file, method = nil, command: nil)        
-          command ||= Command.new(file, method)
-          command_history_for(file)&.last&.next_command = command
-          command.do
-          command_history_for(file) << command
+        def do(file, method = nil, *args, command: nil)
+          if command.nil?
+            command ||= Command.new(file, method, *args)
+            command.previous_command = command_history_for(file).last
+            unless command_history_for(file).last.method == :change_content! && method == :change_content!
+              command_history_for(file).last.next_command = command
+            end
+            command.do
+            command_history_for(file) << command unless command_history_for(file).last.method == :change_content! && method == :change_content!          
+          else
+            command_history_for(file) << command
+          end
         end
         
         def undo(file)
-          return if command_history_for(file).size <= 1        
+          return if command_history_for(file).size <= 1
           command = command_history_for(file).pop
           command&.undo
         end
@@ -30,15 +39,22 @@ module Glimmer
           command = command_history_for(file).last
           command&.redo
         end
+        
+        def clear(file)
+          command_history[file] = [Command.new(file)]
+        end
       end
     
-      attr_accessor :file, :method, :next_command, :previous_file_content, :previous_file_caret_position, :previous_file_selection_count
+      attr_accessor :file, :method, :args, :previous_command, :next_command, 
+                    :file_dirty_content, :file_caret_position, :file_selection_count, :previous_file_dirty_content, :previous_file_caret_position, :previous_file_selection_count
     
-      def initialize(file, method = nil)
+      def initialize(file, method = nil, *args)
         @file = file
         @method = method
+        @args = args
       end
       
+      
       def native?
         @method.nil?
       end
@@ -56,6 +72,9 @@ module Glimmer
       
       def redo
         return if next_command.nil?# || next_command.native?
+        @file.dirty_content = next_command.file_dirty_content.clone
+        @file.caret_position = next_command.file_caret_position
+        @file.selection_count = next_command.file_selection_count
         Command.do(next_command.file, command: next_command)
       end
       
@@ -63,6 +82,10 @@ module Glimmer
         @previous_file_dirty_content = @file.dirty_content.clone
         @previous_file_caret_position = @file.caret_position
         @previous_file_selection_count = @file.selection_count
+        if @method == :change_content!
+          @previous_file_caret_position = @file.last_caret_position
+          @previous_file_selection_count = @file.last_selection_count
+        end
       end
       
       def restore
@@ -72,7 +95,17 @@ module Glimmer
       end
       
       def execute
-        @file.send(@method)
+        @file.start_command
+        @file.send(@method, *@args)
+        @file.end_command
+        @file_dirty_content = @file.dirty_content.clone
+        @file_caret_position = @file.caret_position
+        @file_selection_count = @file.selection_count
+        if previous_command.method == :change_content! && @method == :change_content!
+          previous_command.file_dirty_content = @file_dirty_content
+          previous_command.file_caret_position = @file_caret_position
+          previous_command.file_selection_count = @file_selection_count
+        end
       end
     end
   end

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

@@ -6,8 +6,6 @@ module Glimmer
       include Glimmer
       include Glimmer::DataBinding::ObservableModel
 
-      REFRESH_DELAY = 7
-  
       attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :display_path, :ignore_paths
       attr_reader :name, :parent, :path
       attr_writer :all_children
@@ -15,19 +13,30 @@ module Glimmer
       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
+          @filewatcher = Filewatcher.new(path)
+          Thread.new(@filewatcher) do |fw|
+            begin
+              fw.watch do |filename, event|
+                # TODO do fine grained processing of events for enhanced performance (e.g. dir refresh vs file change)
+                # TODO do fine grained file change only without a refresh delay for enhanced performance
+                begin
+                  if !@refresh_in_progress && !filename.include?('new_file') && (event != :updated || find_child_file(filename).nil?)
+                    Thread.new {
+                      refresh
+                    }
+                  end
+                rescue => e
+                  puts e.full_message
+                end
+              end
+            rescue => e
+              puts e.full_message
+            end
+          end
         end
         self.path = ::File.expand_path(path)
         @name = ::File.basename(::File.expand_path(path))
-        @ignore_paths = ['.gladiator', '.git', 'coverage', 'packages', 'tmp', 'vendor']
+        @ignore_paths = ['.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor']
         self.filtered_path_options = []
       end
       
@@ -48,6 +57,14 @@ module Glimmer
         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
@@ -59,7 +76,7 @@ module Glimmer
             result || p.include?(ignore_path)
           end
         end.map do |p|
-          ::File.file?(p) ? Gladiator::File.new(p, project_dir) : Gladiator::Dir.new(p, project_dir)
+          ::File.file?(p) ? File.new(p, project_dir) : Dir.new(p, project_dir)
         end.sort_by do |c|
           c.path.to_s.downcase
         end.sort_by do |c|
@@ -68,6 +85,22 @@ module Glimmer
           child.retrieve_children if child.is_a?(Dir)
         end
       end
+      
+      def find_child_file(child_path)
+        depth_first_search_file(self, child_path)
+      end
+      
+      def depth_first_search_file(dir, file_path)
+        dir.children.each do |child|
+          if child.is_a?(File)
+            return child if child.path.include?(file_path)
+          else
+            result = depth_first_search_file(child, file_path)
+            return result unless result.nil?
+          end
+        end
+        nil
+      end
   
       def selected_child_path_history
         @selected_child_path_history ||= []
@@ -83,6 +116,7 @@ module Glimmer
 
       def refresh(async: true, force: false)
         return if @refresh_paused && !force
+        @refresh_in_progress = true
         retrieve_children
         collect_all_children
         refresh_operation = lambda do
@@ -94,6 +128,7 @@ module Glimmer
         else
           sync_exec(&refresh_operation)
         end
+        @refresh_in_progress = false
       end
   
       def filter=(value)
@@ -134,19 +169,19 @@ module Glimmer
       end
   
       def selected_child_path=(selected_path)
+        return (project_dir.selected_child = nil) if selected_path.nil?
         # scratchpad scenario
-        if selected_path&.empty? #scratchpad
+        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 selected_path.nil? ||
-                  ::Dir.exist?(full_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, project_dir)
+          new_child = find_child_file(selected_path)
           begin
             unless new_child.dirty_content.nil?
               self.selected_child&.stop_filewatcher
@@ -167,6 +202,7 @@ module Glimmer
       end
       
       def selected_child=(new_child)
+        return if 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
@@ -183,7 +219,7 @@ module Glimmer
       def eql?(other)
         self.path.eql?(other&.path)
       end
-      
+
       def hash
         self.path.hash
       end

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

@@ -3,7 +3,7 @@ module Glimmer
     class File
       include Glimmer
 
-      attr_accessor :dirty_content, :line_numbers_content, :selection, :line_number, :find_text, :replace_text, :top_pixel, :display_path, :case_sensitive
+      attr_accessor :line_numbers_content, :line_number, :find_text, :replace_text, :top_pixel, :display_path, :case_sensitive, :caret_position, :selection_count, :last_caret_position, :last_selection_count, :line_position
       attr_reader :name, :path, :project_dir
 
       def initialize(path='', project_dir=nil)
@@ -13,33 +13,48 @@ module Glimmer
         @name = path.empty? ? 'Scratchpad' : ::File.basename(path)
         self.path = ::File.expand_path(path) unless path.empty?
         @top_pixel = 0
+        @caret_position = 0
         @selection_count = 0
-        @selection = Point.new(0, 0 + @selection_count)
-        read_dirty_content = path.empty? ? '' : ::File.read(path)
-        begin
-          # test read dirty content
-          read_dirty_content.split("\n")
-          observe(self, :dirty_content) do
-            lines_text_size = lines.size.to_s.size
-            self.line_numbers_content = lines.size.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n")
-          end
-          @line_number = 1
-          self.dirty_content = read_dirty_content
-          observe(self, :selection) do
-            self.line_number = line_index_for_caret_position(caret_position) + 1
-          end
-          observe(self, :line_number) do
-            if line_number
+        @last_selection_count = 0
+        @line_number = 1
+        @init = nil
+      end
+      
+      def init_content
+        unless @init
+          @init = true
+          begin
+            # test read dirty content
+            observe(self, :dirty_content) do
+              line_count = lines.empty? ? 1 : lines.size
+              lines_text_size = [line_count.to_s.size, 4].max
+              old_top_pixel = top_pixel
+              self.line_numbers_content = line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n")
+              self.top_pixel = old_top_pixel
+            end
+            the_dirty_content = read_dirty_content
+            the_dirty_content.split("\n") # test that it is not a binary file (crashes to rescue block otherwise)
+            self.dirty_content = the_dirty_content
+            observe(self, :caret_position) do |new_caret_position|
+              new_line_number = line_index_for_caret_position(caret_position) + 1
+              current_line_number = line_number
+              self.line_number = new_line_number unless current_line_number && current_line_number == new_line_number
+              self.line_position = caret_position - caret_position_for_line_index(line_number - 1) + 1
+            end
+            observe(self, :line_number) do |new_line_number|
               line_index = line_number - 1
               new_caret_position = caret_position_for_line_index(line_index)
-              self.caret_position = new_caret_position unless self.caret_position && line_index_for_caret_position(new_caret_position) == line_index_for_caret_position(caret_position)
+              current_caret_position = caret_position
+              line_index_for_new_caret_position = line_index_for_caret_position(new_caret_position)
+              line_index_for_current_caret_position = line_index_for_caret_position(current_caret_position)
+              self.caret_position = new_caret_position unless (current_caret_position && line_index_for_new_caret_position == line_index_for_current_caret_position)
             end
+          rescue # in case of a binary file
+            stop_filewatcher
           end
-        rescue
-          # no op in case of a binary file
         end
       end
-
+      
       def path=(the_path)
         @path = the_path
         generate_display_path
@@ -49,9 +64,18 @@ module Glimmer
         return if @path.empty?
         @display_path = @path.sub(project_dir.path, '').sub(/^\//, '')
       end
+
+      def name=(the_name)
+        new_path = path.sub(/#{Regexp.escape(@name)}$/, the_name) unless scratchpad?
+        @name = the_name
+        if !scratchpad? && ::File.exist?(path)
+          FileUtils.mv(path, new_path)
+          self.path = new_path
+        end
+      end
       
       def scratchpad?
-        path.empty?
+        path.to_s.empty?
       end
 
       def backup_properties
@@ -66,41 +90,73 @@ module Glimmer
           send("#{property}=", value)
         end
       end
+      
+      def caret_position=(value)
+        @last_caret_position = @caret_position
+        @caret_position = value
+      end
+
+      def selection_count=(value)
+        #@last_selection_count = @selection_count
+        @selection_count = value
+        @last_selection_count = @selection_count
+      end
+
+      def dirty_content
+        init_content
+        @dirty_content
+      end
+      
+      def dirty_content=(the_content)
+        # TODO set partial dirty content by line(s) for enhanced performance
+        @dirty_content = the_content
+        old_caret_position = caret_position
+        old_top_pixel = top_pixel
+        
+        notify_observers(:content)
+        if @formatting_dirty_content_for_writing
+          self.caret_position = old_caret_position
+          self.top_pixel = old_top_pixel
+        end
+      end
+      
+      def content
+        dirty_content
+      end
 
       # to use for widget data-binding
       def content=(value)
         value = value.gsub("\t", '  ')
         if dirty_content != value
-          Command.do(self) # record a native (OS-widget) operation
-          self.dirty_content = value
+          Command.do(self, :change_content!, value)
         end
       end
-
-      def content
-        dirty_content
+      
+      def change_content!(value)
+        self.dirty_content = value
       end
 
-      def caret_position=(value)
-        old_top_pixel = top_pixel
-        self.selection = Point.new(value, value + selection_count.to_i)
-        self.top_pixel = old_top_pixel
+      def start_command
+        @commmand_in_progress = true
       end
-
-      def caret_position
-        selection.x
+      
+      def end_command
+        @commmand_in_progress = false
       end
-
-      def selection_count
-        selection.y - selection.x
+      
+      def command_in_progress?
+        @commmand_in_progress
       end
-
-      def selection_count=(value)
-        self.selection = Point.new(caret_position, caret_position + value.to_i)
+      
+      def close
+        stop_filewatcher
+        remove_all_observers
+        initialize(path, project_dir)
+        Command.clear(self)
       end
-
-      def dirty_content=(the_content)
-        @dirty_content = the_content
-        notify_observers(:content)
+      
+      def read_dirty_content
+        path.empty? ? '' : ::File.read(path)
       end
 
       def start_filewatcher
@@ -108,15 +164,13 @@ module Glimmer
         @filewatcher = Filewatcher.new(@path)
         @thread = Thread.new(@filewatcher) do |fw|
           fw.watch do |filename, event|
-            begin
-              read_dirty_content = ::File.read(path)
-              # test read dirty content
-              read_dirty_content.split("\n")
-              async_exec do
+            async_exec do
+              begin
                 self.dirty_content = read_dirty_content if read_dirty_content != dirty_content
+              rescue StandardError, Errno::ENOENT
+                # in case of a binary file
+                stop_filewatcher
               end
-            rescue
-              # no op in case of a binary file
             end
           end
         end
@@ -126,21 +180,28 @@ module Glimmer
         @filewatcher&.stop
       end
 
-      def format_dirty_content_for_writing!
-        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 if scratchpad? || !::File.exist?(path)
+        # TODO write partial dirty content by line(s) for enhanced performance
+        return if scratchpad? || !::File.exist?(path) || !::File.exists?(path) || read_dirty_content == dirty_content
         format_dirty_content_for_writing!
-        ::File.write(path, dirty_content) if ::File.exists?(path)
-      rescue => e
+        ::File.write(path, dirty_content)
+      rescue StandardError, ArgumentError => e
         puts "Error in writing dirty content for #{path}"
         puts e.full_message
       end
 
+      def format_dirty_content_for_writing!
+        return if @commmand_in_progress
+        # TODO  f ix c ar e t pos it ion after formatting dirty content (diff?)
+        new_dirty_content = dirty_content.to_s.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"
+        if new_dirty_content != self.dirty_content
+          @formatting_dirty_content_for_writing = true
+          self.dirty_content = new_dirty_content
+          @formatting_dirty_content_for_writing = false
+        end
+      end
+
       def write_raw_dirty_content
         return if scratchpad? || !::File.exist?(path)
         ::File.write(path, dirty_content) if ::File.exists?(path)
@@ -176,7 +237,7 @@ module Glimmer
         self.caret_position = caret_position_for_line_index(line_number) + current_line_indentation.size
         self.selection_count = 0
       end
-
+      
       def comment_line!
         old_lines = lines
         return if old_lines.size < 1
@@ -210,6 +271,7 @@ module Glimmer
           new_caret_position = old_caret_position + delta
           new_caret_position = [new_caret_position, old_caret_position_line_caret_position].max
           self.caret_position = new_caret_position
+          self.selection_count = 0
         end
       end
 
@@ -234,6 +296,7 @@ module Glimmer
           self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
         else
           self.caret_position = old_caret_position + delta
+          self.selection_count = 0
         end
       end
 
@@ -265,6 +328,7 @@ module Glimmer
           new_caret_position = old_caret_position + delta
           new_caret_position = [new_caret_position, old_caret_position_line_caret_position].max
           self.caret_position = new_caret_position
+          self.selection_count = 0
         end
       end
 
@@ -302,6 +366,7 @@ module Glimmer
           self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
         else
           self.caret_position = old_caret_position + delta
+          self.selection_count = 0
         end
       end