glimmer-cs-gladiator 0.5.3 → 0.6.3

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

@@ -1,6 +1,8 @@
 module Glimmer
   class Gladiator
     class Command
+      include Glimmer
+      
       class << self
         include Glimmer
         
@@ -13,11 +15,18 @@ module Glimmer
           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)
@@ -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
       
@@ -67,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|
@@ -76,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 ||= []
@@ -91,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
@@ -102,6 +128,7 @@ module Glimmer
         else
           sync_exec(&refresh_operation)
         end
+        @refresh_in_progress = false
       end
   
       def filter=(value)
@@ -144,7 +171,7 @@ module Glimmer
       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
@@ -154,7 +181,7 @@ module Glimmer
         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
@@ -175,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
@@ -191,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,55 @@ 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|
+              update_line_number_from_caret_position(new_caret_position)
+            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 update_line_number_from_caret_position(new_caret_position)
+        new_line_number = line_index_for_caret_position(caret_position) + 1
+        current_line_number = line_number
+        unless (current_line_number && current_line_number == new_line_number)
+          self.line_number = new_line_number
+          # TODO check if the following line is needed
+          self.line_position = caret_position - caret_position_for_line_index(line_number - 1) + 1
+        end
+      end
+      
       def path=(the_path)
         @path = the_path
         generate_display_path
@@ -49,6 +71,15 @@ 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.to_s.empty?
@@ -66,50 +97,74 @@ module Glimmer
           send("#{property}=", value)
         end
       end
+      
+      def caret_position=(value)
+        @last_caret_position = @caret_position
+        @caret_position = value
+      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
-        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
 
-      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
+      # to use for widget data-binding
+      def content=(value)
+        value = value.gsub("\t", '  ')
+        if dirty_content != value
+          Command.do(self, :change_content!, value)
+        end
       end
-
-      def caret_position
-        selection.x
+      
+      def change_content!(value)
+        self.dirty_content = value
+        update_line_number_from_caret_position(caret_position)
       end
 
-      def selection_count
-        selection.y - selection.x
+      def start_command
+        @commmand_in_progress = true
       end
-
-      def selection_count=(value)
-        self.selection = Point.new(caret_position, caret_position + value.to_i)
+      
+      def end_command
+        @commmand_in_progress = false
       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
+      
+      def command_in_progress?
+        @commmand_in_progress
       end
       
-      def dirty_content=(the_content)
-        @dirty_content = the_content
-        notify_observers(:content)
+      def close
+        stop_filewatcher
+        remove_all_observers
+        initialize(path, project_dir)
+        Command.clear(self)
+      end
+      
+      def read_dirty_content
+        path.empty? ? '' : ::File.read(path)
       end
 
       def start_filewatcher
@@ -117,15 +172,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
@@ -135,21 +188,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)
@@ -185,7 +245,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
@@ -219,6 +279,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
 
@@ -243,6 +304,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
 
@@ -274,6 +336,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
 
@@ -311,6 +374,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
 
@@ -455,13 +519,18 @@ module Glimmer
             write_dirty_content
             load path
           end
-        rescue SyntaxError, StandardError => e
+        rescue LoadError, SyntaxError, StandardError => e
+          # TODO consider showing a message dialog or error message console in the future
           puts e.full_message
         end
       end
 
       def lines
-        dirty_content.split("\n")
+        need_padding = dirty_content.to_s.end_with?("\n")
+        splittable_content = need_padding ? "#{dirty_content} " : dirty_content
+        the_lines = splittable_content.split("\n")
+        the_lines[-1] = the_lines[-1].strip if need_padding
+        the_lines
       end
 
       def line_for_caret_position(caret_position)
@@ -471,7 +540,7 @@ module Glimmer
       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