glimmer-cs-gladiator 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b934c1a94dfd1a6544aeecc4b4be8296ba361725a3c5a668a41411eb6b2d6c5
-  data.tar.gz: 6060afe18157c255ad483b26ff1bf137d3f9e7083df4945876ac258e85ef412f
+  metadata.gz: 9397375fcae09b0628d7cea62e30cf9e10e1bccc236a10717bf442824adf9bb4
+  data.tar.gz: 46500cd7bcc7636295ea1466369f9ef4a819dac0f27e87615ffec510634ec078
 SHA512:
-  metadata.gz: 9f225ed4adab885600d43209c7f21fed87d78b584f47fd9b6a35d07d39b784208d1c8df6ca0e7e8b616cb593a3d35625c48b6ff3c5b4121c49c59ce7a2dcb990
-  data.tar.gz: 858eff913bfd012b0aaf9511141cb55f1d427ea57a6b01bb85d7403e3e0e1c5f57000c1878efdacad0504e67949ba59a915d279165669f36d7d410b98922aee8
+  metadata.gz: f266d9d55637f38f001f6e80b553a704d85e809b3ccd9fd29ac942bf7ce1b747133964176a42d0cc4fa7e07474fed78c03cce611fadd7d90b0ee5206282d18ac
+  data.tar.gz: 4a4f36dac54c4069ef32268342e2698092dff0b19df564e8173db73b63bfa1b515274eb54353ed09f6417afcfa2967f9e2b538caf980d88683d4cff6f753d629

data/README.md

@@ -1,4 +1,4 @@
-# Gladiator (Glimmer Editor) 0.1.4 - Glimmer Custom Shell
+# Gladiator (Glimmer Editor) 0.2.0 - Glimmer Custom Shell
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
 ![Gladiator](images/glimmer-gladiator.png)
@@ -9,27 +9,35 @@ Gladiator is also a personal tool for shaping an editor exactly the way I like.
 I leave building truly professional text editors to software tooling experts who would hopefully use Glimmer one day.
 
 Gladiator currently supports the following text editing features:
-- File explorer navigation to open file, rename, delete, add new file, add new directory, or refresh tree
-- File lookup by name ignoring slashes, underscores, and dots to ease lookup
+- File explorer navigation 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
+- Find & Replace (CMD+F)
 - Show Line Numbers
-- Jump to Line
-- Multiple tab support
-- Remember last opened file, caret position, top line, window size, and window location
-- Autosave on focus out/quit/open new file
-- Duplicate Line(s)/selection
-- Kill Line(s)/selection
-- Move line/selection up
-- Move line/selection down
-- Comment/Uncomment line/selection
-- Indent/Unindent line/selection
+- 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 
+- Duplicate Line(s)/selection (CMD+D)
+- Kill Line(s)/selection (CMD+K)
+- Move line/selection up (CMD+UP)
+- Move line/selection down (CMD+DOWN)
+- Comment/Uncomment line/selection (CMD+/)
+- Indent/Unindent line/selection (CMD+] & CMD+[)
+- Insert/Prefix New Line (CMD+ENTER & CMD+SHIFT+ENTER)
+
+## Platforms
+
+- Mac: Gladiator works best on the Mac.
+- Linux: Gladiator works with handicaps on Linux (performing text editing operations causes scroll jitter)
+- Windows: Not tested on Windows yet, but should theoretically work there too.
 
 ## Pre-requisites
 
-- JRuby 9.2.11.1 (supporting Ruby 2.5.x syntax) (find at https://www.jruby.org/download)
-- Java SE Runtime Environment 7 or higher (find at https://www.oracle.com/java/technologies/javase-downloads.html)
+- [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library): '>= 0.1.0', '< 2.0.0' (dependency included in Ruby gem).
+- [JRuby](https://www.jruby.org/download): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer)
+- [JDK](https://www.oracle.com/java/technologies/javase-downloads.html): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer)
 
 ## Setup Instructions
 
@@ -53,7 +61,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '0.1.4'
+gem 'glimmer-cs-gladiator', '0.2.0'
 ```
 
 Run:

data/VERSION

@@ -0,0 +1 @@
+0.2.0

data/bin/gladiator

@@ -3,4 +3,11 @@
 require 'glimmer/launcher'
 
 gladiator_runner = File.expand_path('../gladiator_runner.rb', __FILE__)
-Glimmer::Launcher.new([gladiator_runner, '-J-Xrs'] + ARGV).launch
+launcher = Glimmer::Launcher.new([gladiator_runner, '-J-Xrs'] + ARGV)
+launcher.application_paths.to_a.each do |file|
+  if file != gladiator_runner
+    launcher.application_paths.delete(file)
+    ENV['LOCAL_DIR'] ||= file
+  end
+end
+launcher.launch

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

@@ -0,0 +1,75 @@
+module Glimmer
+  class Gladiator
+    class Command
+      class << self
+        def command_history
+          @command_history ||= {}
+        end
+        
+        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)] 
+        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
+        end
+        
+        def undo(file)
+          return if command_history_for(file).size <= 1        
+          command_history_for(file).pop.undo
+        end
+        
+        def redo(file)
+          command_history_for(file).last&.redo
+        end
+      end
+    
+      attr_accessor :file, :method, :next_command, :previous_file_content, :previous_file_caret_position, :previous_file_selection_count
+    
+      def initialize(file, method = nil)
+        @file = file
+        @method = method
+      end
+      
+      def native?
+        @method.nil?
+      end
+      
+      def do
+        return if native?
+        backup
+        execute
+      end
+      
+      def undo
+        return if native?
+        restore
+      end
+      
+      def redo
+        return if next_command.nil?# || next_command.native?
+        Command.do(next_command.file, command: next_command)
+      end
+      
+      def backup
+        @previous_file_dirty_content = @file.dirty_content.clone
+        @previous_file_caret_position = @file.caret_position
+        @previous_file_selection_count = @file.selection_count
+      end
+      
+      def restore
+        @file.dirty_content = @previous_file_dirty_content.clone
+        @file.caret_position = @previous_file_caret_position
+        @file.selection_count = @previous_file_selection_count
+      end
+      
+      def execute
+        @file.send(@method)
+      end
+    end
+  end
+end

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

@@ -117,7 +117,7 @@ module Glimmer
           begin
             unless new_child.dirty_content.nil?
               self.selected_child&.stop_filewatcher
-              selected_child_path_history << self.selected_child.path if self.selected_child
+              selected_child_path_history << new_child.path if new_child && !selected_child_path_history.include?(new_child.path)
               self.selected_child = new_child
               self.selected_child.start_filewatcher
             end
@@ -140,6 +140,14 @@ module Glimmer
       def to_s
         path
       end
+      
+      def eql?(other)
+        self.path.eql?(other&.path)
+      end
+      
+      def hash
+        self.path.hash
+      end
     end  
   end
 end

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

@@ -5,14 +5,18 @@ module Glimmer
     class File
       include Glimmer
   
-      attr_accessor :line_numbers_content, :caret_position, :selection_count, :line_number, :find_text, :replace_text, :top_index, :path, :display_path
-      attr_reader :name, :dirty_content
+      attr_accessor :dirty_content, :line_numbers_content, :selection, :selection_count, :line_number, :find_text, :replace_text, :top_index, :path, :display_path, :case_sensitive
+      attr_reader :name
   
       def initialize(path)
         raise "Not a file path: #{path}" unless ::File.file?(path)
+        @command_history = []
         @display_path = path
         @name = ::File.basename(path)
         @path = ::File.expand_path(path)
+        @top_index = 0
+        @selection_count = 0
+        @selection = Point.new(0, 0 + @selection_count)
         read_dirty_content = ::File.read(path)
         begin
           # test read dirty content
@@ -21,8 +25,9 @@ module Glimmer
             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, :caret_position) do
+          observe(self, :selection) do
             self.line_number = line_index_for_caret_position(caret_position) + 1
           end
           observe(self, :line_number) do
@@ -36,7 +41,30 @@ module Glimmer
           # no op in case of a binary file
         end
       end
-  
+      
+      # to use for widget data-binding
+      def content=(value)
+        Command.do(self) # record a native (OS-widget) operation
+        self.dirty_content = value
+      end
+
+      def content
+        dirty_content
+      end
+
+      def caret_position=(value)
+        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
+      end
+      
+      def caret_position
+        selection.x
+      end
+      
       def name=(the_name)
         self.display_path = display_path.sub(/#{Regexp.escape(@name)}$/, the_name)
         @name = the_name
@@ -47,6 +75,7 @@ module Glimmer
       
       def dirty_content=(the_content)
         @dirty_content = the_content if ::File.exist?(path)
+        notify_observers(:content)
       end
   
       def start_filewatcher
@@ -105,6 +134,13 @@ module Glimmer
         FileUtils.rm(path)        
       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
+      end
+
       def insert_new_line!
         the_lines = lines
         the_lines[line_number...line_number] = [current_line_indentation]
@@ -125,6 +161,7 @@ module Glimmer
         line_indices_for_selection(caret_position, selection_count).reverse.each do | the_line_index |
           delta = 0
           the_line = old_lines[the_line_index]
+          return if the_line.nil?
           if the_line.strip.start_with?('# ')
             new_lines[the_line_index] = the_line.sub(/# /, '')
             delta -= 2
@@ -183,7 +220,7 @@ module Glimmer
         delta = 0
         line_indices_for_selection(caret_position, selection_count).each do |the_line_index|
           the_line = old_lines[the_line_index]
-          if the_line.start_with?('  ')
+          if the_line.to_s.start_with?('  ')
             new_lines[the_line_index] = the_line.sub(/  /, '')
             delta = -2
           elsif the_line.start_with?(' ')
@@ -240,7 +277,7 @@ module Glimmer
       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)
@@ -251,8 +288,8 @@ module Glimmer
             the_index = (the_index + rotation)%all_lines.size
             start_position = 0
             start_position = line_position + find_text.to_s.size if i == 0 && the_index == the_line_index && found_text?(caret_position)
-            text_to_find_in = the_line.downcase[start_position..-1]
-            occurrence_index = text_to_find_in.index(find_text.to_s.downcase)
+            text_to_find_in = the_line[start_position..-1]
+            occurrence_index = case_sensitive ? text_to_find_in&.index(find_text.to_s) : text_to_find_in&.downcase&.index(find_text.to_s.downcase)
             if occurrence_index
               self.caret_position = caret_position_for_line_index(the_index) + start_position + occurrence_index
               self.selection_count = find_text.to_s.size
@@ -306,18 +343,22 @@ module Glimmer
       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
   
@@ -421,6 +462,14 @@ module Glimmer
       def to_s
         path
       end
+      
+      def eql?(other)
+        self.path.eql?(other&.path)
+      end
+      
+      def hash
+        self.path.hash
+      end
     end  
   end
 end

data/lib/views/glimmer/gladiator.rb

@@ -4,9 +4,11 @@ rescue LoadError
   # no op
 end
 require 'fileutils'
+require 'os'
 
 require 'models/glimmer/gladiator/dir'
 require 'models/glimmer/gladiator/file'
+require 'models/glimmer/gladiator/command'
 
 require 'views/glimmer/gladiator/text_editor'
 
@@ -19,6 +21,8 @@ module Glimmer
   # Gladiator (Glimmer Editor)
   class Gladiator
     include Glimmer::UI::CustomShell
+    
+    COMMAND_KEY = OS.mac? ? :command : :ctrl
 
     ## Add options like the following to configure CustomShell by outside consumers
     #
@@ -33,70 +37,90 @@ module Glimmer
       Display.setAppName('Gladiator')
       @display = display {
         on_event_keydown { |key_event|
-          if Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == 'f'
-            if @text_editor.text_widget.getSelectionText && @text_editor.text_widget.getSelectionText.size > 0
+          if key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'f'
+            if @text_editor&.text_widget&.getSelectionText && @text_editor&.text_widget&.getSelectionText&.size.to_i > 0
               @find_text.swt_widget.setText @text_editor.text_widget.getSelectionText
             end
             @find_text.swt_widget.selectAll
             @find_text.swt_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.character.chr.downcase == 'c'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'c'
             Clipboard.copy(Gladiator::Dir.local_dir.selected_child.path)
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.character.chr.downcase == 'g'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'g'
             Gladiator::Dir.local_dir.selected_child.find_previous
-#           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.character.chr.downcase == 'w'
-#             @tab_folder.swt_widget.getItems.each(&:dispose)
-#           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :alt) && key_event.character.chr.downcase == 'w'
-#             @tab_folder.swt_widget.getItems.each do |ti|
-#               ti.dispose unless ti == @tab_folder.swt_widget.getSelection()
-#             end
-#           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == 'w'
-#             @tab_folder.swt_widget.getSelection.each(&:dispose)
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.character.chr.downcase == ']'
-            @tab_folder.swt_widget.setSelection([@tab_folder.swt_widget.getSelectionIndex() + 1, @tab_folder.swt_widget.getItemCount - 1].min) if @tab_folder.swt_widget.getItemCount > 0
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'w'
+            @tab_folder.swt_widget.getItems.each do |tab_item|
+              Dir.local_dir.selected_child_path_history.delete(tab_item.getData('file_path'))
+              tab_item.getData('proxy').dispose
+            end
+            @tab_item = @text_editor = Dir.local_dir.selected_child = nil 
+            @filter_text.swt_widget.selectAll     
+            @filter_text.swt_widget.setFocus            
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :alt) && extract_char(key_event) == 'w'
+            other_tab_items.each do |tab_item|
+              Dir.local_dir.selected_child_path_history.delete(tab_item.getData('file_path'))
+              tab_item.getData('proxy').dispose
+            end
+          elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'w'
+            if selected_tab_item
+              Dir.local_dir.selected_child_path_history.delete(Dir.local_dir.selected_child.path)
+              selected_tab_item.getData('proxy').dispose
+              if selected_tab_item.nil?
+                @tab_item = @text_editor = Dir.local_dir.selected_child = nil 
+                @filter_text.swt_widget.selectAll     
+                @filter_text.swt_widget.setFocus
+              else
+                @text_editor.text_widget.setFocus
+              end
+            end
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == ']'
+            @tab_folder.swt_widget.setSelection((@tab_folder.swt_widget.getSelectionIndex() + 1) % @tab_folder.swt_widget.getItemCount) if @tab_folder.swt_widget.getItemCount > 0
             @text_editor.text_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.character.chr.downcase == '['
-            @tab_folder.swt_widget.setSelection([@tab_folder.swt_widget.getSelectionIndex() - 1, 0].max) if @tab_folder.swt_widget.getItemCount > 0
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == '['
+            @tab_folder.swt_widget.setSelection((@tab_folder.swt_widget.getSelectionIndex() - 1) % @tab_folder.swt_widget.getItemCount) if @tab_folder.swt_widget.getItemCount > 0
             @text_editor.text_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == '1'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '1'
             @tab_folder.swt_widget.setSelection(0) if @tab_folder.swt_widget.getItemCount >= 1
             @text_editor.text_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == '2'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '2'
             @tab_folder.swt_widget.setSelection(1) if @tab_folder.swt_widget.getItemCount >= 2
             @text_editor.text_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == '3'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '3'
             @tab_folder.swt_widget.setSelection(2) if @tab_folder.swt_widget.getItemCount >= 3
             @text_editor.text_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == '4'
             @tab_folder.swt_widget.setSelection(3) if @tab_folder.swt_widget.getItemCount >= 4
             @text_editor.text_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == '5'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '5'
             @tab_folder.swt_widget.setSelection(4) if @tab_folder.swt_widget.getItemCount >= 5
             @text_editor.text_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == '6'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '4'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '6'
             @tab_folder.swt_widget.setSelection(5) if @tab_folder.swt_widget.getItemCount >= 6
             @text_editor.text_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == '7'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '7'
             @tab_folder.swt_widget.setSelection(6) if @tab_folder.swt_widget.getItemCount >= 7
             @text_editor.text_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == '8'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '8'
             @tab_folder.swt_widget.setSelection(7) if @tab_folder.swt_widget.getItemCount >= 8
             @text_editor.text_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == '9'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '9'
             @tab_folder.swt_widget.setSelection(@tab_folder.swt_widget.getItemCount - 1) if @tab_folder.swt_widget.getItemCount > 0
             @text_editor.text_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == 'g'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 'g'
             Gladiator::Dir.local_dir.selected_child.find_next
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == 'l'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 'l'
             @line_number_text.swt_widget.selectAll
             @line_number_text.swt_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == 'r'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 'r'
             @filter_text.swt_widget.selectAll
             @filter_text.swt_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr.downcase == 't'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 't'
+            select_tree_item unless @rename_in_progress
             @tree.swt_widget.setFocus
           elsif key_event.keyCode == swt(:esc)
-            Dir.local_dir.selected_child_path = @text_editor.file.path
-            @text_editor.text_widget.setFocus
+            if @text_editor
+              Dir.local_dir.selected_child_path = @text_editor.file.path
+              @text_editor.text_widget.setFocus
+            end
           end
         }
       }
@@ -116,12 +140,12 @@ module Glimmer
       observe(Gladiator::Dir.local_dir, 'selected_child') do
         select_tree_item unless @rename_in_progress
         selected_file = Gladiator::Dir.local_dir.selected_child
-        found_tab_item = @tab_folder.swt_widget.getItems.detect {|ti| ti.getData('file_path') == selected_file.path}
+        found_tab_item = selected_tab_item
         if found_tab_item
           @tab_folder.swt_widget.setSelection(found_tab_item)
           @tab_item = found_tab_item.getData('tab_item')
           @text_editor = found_tab_item.getData('text_editor')
-        else
+        elsif selected_file
           @tab_folder.content {
             @tab_item = tab_item { |the_tab_item|
               text selected_file.name
@@ -136,6 +160,7 @@ module Glimmer
             @tab_item.swt_tab_item.setData('file_path', selected_file.path)
             @tab_item.swt_tab_item.setData('tab_item', @tab_item)
             @tab_item.swt_tab_item.setData('text_editor', @text_editor)
+            @tab_item.swt_tab_item.setData('proxy', @tab_item)
           }                  
           @tab_folder.swt_widget.setSelection(@tab_item.swt_tab_item)
           body_root.pack_same_size
@@ -173,6 +198,9 @@ module Glimmer
         }
         on_control_moved {
           save_config
+        }
+        on_shell_deactivated {
+          @text_editor&.file&.write_dirty_content
         }        
         composite {
           grid_layout 1, false
@@ -193,12 +221,11 @@ module Glimmer
             }    
           }
           composite {
+            fill_layout(:vertical) {
+              spacing 5
+            }
             layout_data(:fill, :fill, true, true)
             @list = list(:border, :h_scroll, :v_scroll) {
-              layout_data(:fill, :fill, true, true) {
-                #exclude bind(Gladiator::Dir.local_dir, :filter) {|f| !f}
-                minimum_height 400
-              }
               #visible bind(Gladiator::Dir, 'local_dir.filter') {|f| !!f}
               selection bind(Gladiator::Dir.local_dir, :filtered_path)
               on_mouse_up {
@@ -207,14 +234,11 @@ module Glimmer
               on_key_pressed { |key_event|
                 if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
                   Gladiator::Dir.local_dir.selected_child_path = @list.swt_widget.getSelection.first
-                  @text_editor.text_widget.setFocus
+                  @text_editor&.text_widget&.setFocus
                 end
               }
             }
             @tree = tree(:virtual, :border, :h_scroll, :v_scroll) {
-              layout_data(:fill, :fill, true, true) {
-                #exclude bind(Gladiator::Dir.local_dir, :filter) {|f| !!f}
-              }
               #visible bind(Gladiator::Dir, 'local_dir.filter') {|f| !f}
               items bind(Gladiator::Dir, :local_dir), tree_properties(children: :children, text: :name)
               menu {
@@ -262,12 +286,13 @@ module Glimmer
                 @open_menu_item.swt_widget.setEnabled(!::Dir.exist?(path)) if path
               }
               on_mouse_up {
-                Gladiator::Dir.local_dir.selected_child_path = extract_tree_item_path(@tree.swt_widget.getSelection.first)
+                Gladiator::Dir.local_dir.selected_child_path = extract_tree_item_path(@tree.swt_widget.getSelection&.first)
+                @text_editor&.text_widget&.setFocus
               }
               on_key_pressed { |key_event|
                 if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
                   Gladiator::Dir.local_dir.selected_child_path = extract_tree_item_path(@tree.swt_widget.getSelection&.first)
-                  @text_editor.text_widget.setFocus
+                  @text_editor&.text_widget&.setFocus
                 end
               }
               on_paint_control {
@@ -289,10 +314,13 @@ module Glimmer
           grid_layout 1, false
           layout_data :fill, :fill, true, true
           composite {
-            grid_layout 2, false
+            grid_layout 3, false
+            
+            # row 1
+            
             @file_path_label = styled_text(:none) {
               layout_data(:fill, :fill, true, false) {
-                horizontal_span 2
+                horizontal_span 3
               }
               background color(:widget_background)
               editable false
@@ -305,6 +333,9 @@ module Glimmer
                 @file_path_label.swt_widget.setSelection(0, 0)
               }
             }
+            
+            # row 2
+            
             label {
               text 'Line:'
             }
@@ -315,10 +346,17 @@ module Glimmer
               text bind(Gladiator::Dir.local_dir, 'selected_child.line_number', on_read: :to_s, on_write: :to_i)
               on_key_pressed { |key_event|
                 if key_event.keyCode == swt(:cr)
-                  @text_editor.text_widget.setFocus
+                  @text_editor&.text_widget&.setFocus
                 end
               }
+              on_verify_text { |event|
+                event.doit = !event.text.match(/^\d*$/).to_a.empty? 
+              }
             }
+            label
+            
+            # row 3
+
             label {
               text 'Find:'
             }
@@ -328,11 +366,32 @@ module Glimmer
               }
               text bind(Gladiator::Dir.local_dir, 'selected_child.find_text')
               on_key_pressed { |key_event|
+                if key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:cr)
+                  Dir.local_dir.selected_child.case_sensitive = !Dir.local_dir.selected_child.case_sensitive
+                  Gladiator::Dir.local_dir.selected_child&.find_next
+                end
                 if key_event.keyCode == swt(:cr)
-                  Gladiator::Dir.local_dir.selected_child.find_next
+                  Gladiator::Dir.local_dir.selected_child&.find_next
                 end
               }
             }
+            composite {
+              row_layout
+              button(:check) {
+                selection bind(Dir.local_dir, 'selected_child.case_sensitive')
+                on_key_pressed { |key_event|
+                  if key_event.keyCode == swt(:cr)
+                    Gladiator::Dir.local_dir.selected_child&.find_next
+                  end
+                }                
+              }
+              label {
+                text 'Case-sensitive'
+              }
+            }
+            
+            # row 4
+            
             label {
               text 'Replace:'
             }
@@ -342,14 +401,17 @@ module Glimmer
               }
               text bind(Gladiator::Dir.local_dir, 'selected_child.replace_text')
               on_focus_gained {              
-                Gladiator::Dir.local_dir.selected_child.ensure_find_next
+                Gladiator::Dir.local_dir.selected_child&.ensure_find_next
               }
               on_key_pressed { |key_event|
                 if key_event.keyCode == swt(:cr)
-                  Gladiator::Dir.local_dir.selected_child.replace_next!
+                  if Gladiator::Dir.local_dir.selected_child
+                    Command.do(Gladiator::Dir.local_dir.selected_child, :replace_next!)
+                  end
                 end
               }
             }
+            label
           }
           @tab_folder = tab_folder {
             layout_data(:fill, :fill, true, true) 
@@ -363,6 +425,9 @@ module Glimmer
         config_yaml = ::File.read(@config_file_path)
         return if config_yaml.to_s.strip.empty?
         @config = YAML.load(config_yaml)
+        @config[:open_file_paths].to_a.each do |file_path|
+          Gladiator::Dir.local_dir.selected_child_path = file_path
+        end
         Gladiator::Dir.local_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path]
         Gladiator::Dir.local_dir.selected_child&.caret_position  = Gladiator::Dir.local_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
         Gladiator::Dir.local_dir.selected_child&.top_index = @config[:top_index].to_i if @config[:top_index]
@@ -371,6 +436,8 @@ module Glimmer
           swt_widget.setLocation(@config[:shell_x], @config[:shell_y]) if @config[:shell_x] && @config[:shell_y]          
           @loaded_config = true
         }
+      else
+        @loaded_config = true
       end
     end
   
@@ -386,19 +453,28 @@ module Glimmer
         shell_height: swt_widget&.getBounds&.height,
         shell_x: swt_widget&.getBounds&.x,
         shell_y: swt_widget&.getBounds&.y,
+        open_file_paths: Dir.local_dir.selected_child_path_history,
       }
       config_yaml = YAML.dump(@config)
       ::File.write(@config_file_path, config_yaml) unless config_yaml.to_s.empty?
     rescue => e
       puts e.full_message
     end
+    
+    def selected_tab_item
+      @tab_folder.swt_widget.getItems.detect { |ti| ti.getData('file_path') == Gladiator::Dir.local_dir.selected_child&.path }
+    end
+
+    def other_tab_items
+      @tab_folder.swt_widget.getItems.reject { |ti| ti.getData('file_path') == Gladiator::Dir.local_dir.selected_child&.path }
+    end
 
     def extract_tree_item_path(tree_item)
       return if tree_item.nil?
       if tree_item.getParentItem
         ::File.join(extract_tree_item_path(tree_item.getParentItem), tree_item.getText)
       else
-        '.'
+        Dir.local_dir.path
       end
     end
     
@@ -409,9 +485,10 @@ module Glimmer
     end
 
     def delete_tree_item(tree_item)
+      return if tree_item.nil?
       file = tree_item.getData
       parent_path = ::File.dirname(file.path)
-      file.delete!
+      file.delete! # TODO consider supporting command undo/redo
       Dir.local_dir.refresh(async: false)
       parent_tree_item = @tree.depth_first_search {|ti| ti.getData.path == parent_path}.first
       @tree.swt_widget.showItem(parent_tree_item)
@@ -432,6 +509,7 @@ module Glimmer
       Dir.local_dir.pause_refresh
       tree_item = @tree.swt_widget.getSelection.first
       directory_path = extract_tree_item_path(tree_item)
+      return if directory_path.nil?
       if !::Dir.exist?(directory_path)
         tree_item = tree_item.getParentItem
         directory_path = ::File.dirname(directory_path)
@@ -461,42 +539,25 @@ module Glimmer
     end
     
     def rename_tree_item(tree_item, open_afterwards = false)
-      @tree.content {
-        @tree_text = text {
-          focus true
-          text tree_item.getText
-          @action_taken = false
-          action = lambda { |event|
-            if !@action_taken && !@rename_in_progress
-              @action_taken = true
-              @rename_in_progress = true
-              new_text = @tree_text.swt_widget.getText
-              tree_item.setText(new_text)
-              file = tree_item.getData
-              file.name = new_text
-              file_path = file.path
-              tree_item = @tree.depth_first_search { |ti| ti.getData.path == file_path }
-              @tree.swt_widget.showItem(tree_item.first)
-              @tree_text.swt_widget.dispose              
-              Dir.local_dir.selected_child_path = file_path if open_afterwards
-              Dir.local_dir.resume_refresh
-              @rename_in_progress = false
-            end
-          }
-          on_focus_lost(&action)
-          on_key_pressed { |key_event|
-            if key_event.keyCode == swt(:cr)
-              action.call(key_event)
-            elsif key_event.keyCode == swt(:esc)
-              @tree_text.swt_widget.dispose
-              Dir.local_dir.resume_refresh
-              @rename_in_progress = false
-            end
-          }
+      @tree.edit_tree_item(
+        tree_item,
+        after_write: -> (edited_tree_item) {
+          file = edited_tree_item.getData
+          file_path = file.path
+          # TODO rename file in tab title
+          Dir.local_dir.selected_child_path = file_path if open_afterwards
+          Dir.local_dir.resume_refresh            
+        },
+        after_cancel: -> {
+          Dir.local_dir.resume_refresh            
         }
-        @tree_text.swt_widget.selectAll
-      }
-      @tree_editor.setEditor(@tree_text.swt_widget, tree_item);
+      )
+    end
+
+    def extract_char(event)
+      event.keyCode.chr
+    rescue => e
+      nil
     end
   end
-end
+end                        

data/lib/views/glimmer/gladiator/text_editor.rb

@@ -17,7 +17,7 @@ module Glimmer
           grid_layout 2, false
           @line_numbers_text = text(:multi) {
             layout_data(:right, :fill, false, true)
-            font name: 'Consolas', height: 15
+            font name: 'Consolas', height: OS.mac? ? 15 : 12
             background color(:widget_background)
             foreground rgb(75, 75, 75)
             text bind(file, 'line_numbers_content')
@@ -34,29 +34,42 @@ module Glimmer
           }
           @text = text(:multi, :border, :h_scroll, :v_scroll) {
             layout_data :fill, :fill, true, true
-            font name: 'Consolas', height: 15
+            font name: 'Consolas', height: OS.mac? ? 15 : 12
             foreground rgb(75, 75, 75)
-            text bind(file, 'dirty_content')
+            text bind(file, :content)
             focus true
-            caret_position bind(file, 'caret_position')
+            selection bind(file, 'selection')
             selection_count bind(file, 'selection_count')
             top_index bind(file, 'top_index')
             on_focus_lost {
               file&.write_dirty_content
             }
       	     on_key_pressed { |key_event|
-              if key_event.stateMask == swt(:command) && key_event.character.chr.downcase == '/'
-                file.comment_line!
-              elsif key_event.stateMask == swt(:command) && key_event.character.chr.downcase == 'k'
-                file.kill_line!
-              elsif key_event.stateMask == swt(:command) && key_event.character.chr.downcase == 'd'
-                file.duplicate_line!
-              elsif key_event.stateMask == swt(:command) && key_event.character.chr.downcase == '['
-                file.outdent!
-              elsif key_event.stateMask == swt(:command) && key_event.character.chr.downcase == ']'
-                file.indent!
-              elsif key_event.stateMask == swt(:command) && key_event.keyCode == swt('cr')
-                file.insert_new_line!
+              if (Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'z') || (key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'y')                
+                key_event.doit = !Command.redo(file)
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'z'
+                key_event.doit = !Command.undo(file)
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '/'
+                Command.do(file, :comment_line!)
+                key_event.doit = false
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'k'
+                Command.do(file, :kill_line!)
+                key_event.doit = false
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'd'
+                Command.do(file, :duplicate_line!)
+                key_event.doit = false
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '['
+                Command.do(file, :outdent!)
+                key_event.doit = false
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == ']'
+                Command.do(file, :indent!)
+                key_event.doit = false
+              elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && key_event.keyCode == swt(:cr)
+                Command.do(file, :prefix_new_line!)
+                key_event.doit = false
+              elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:cr)
+                Command.do(file, :insert_new_line!)
+                key_event.doit = false
               elsif key_event.keyCode == swt(:page_up)
                 file.page_up
                 key_event.doit = false
@@ -69,11 +82,11 @@ module Glimmer
               elsif key_event.keyCode == swt(:end)
                 file.end
                 key_event.doit = false
-              elsif key_event.stateMask == swt(:command) && key_event.keyCode == swt(:arrow_up)
-                file.move_up!
+              elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_up)
+                Command.do(file, :move_up!)
                 key_event.doit = false
-              elsif key_event.stateMask == swt(:command) && key_event.keyCode == swt(:arrow_down)
-                file.move_down!
+              elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_down)
+                Command.do(file, :move_down!)
                 key_event.doit = false
               end
             }
@@ -86,7 +99,7 @@ module Glimmer
                 end
               when swt(:tab)
                 if file.selection_count.to_i > 0
-                  file.indent!
+                  Command.do(file, :indent!)
                   verify_event.doit = false
                 else
                   verify_event.text = '  '
@@ -96,6 +109,15 @@ module Glimmer
           }
         }
       }
+      
+      
+      def extract_char(event)
+        event.keyCode.chr
+      rescue => e
+        nil
+      end
+                                                                                                                                                                                                                                                                                                      
     end
   end
 end
+                                              

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.7.4
-  name: glimmer
+        version: 2.0.0
+  name: glimmer-dsl-swt
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -124,9 +130,11 @@ extra_rdoc_files:
 files:
 - LICENSE.txt
 - README.md
+- VERSION
 - bin/gladiator
 - bin/gladiator_runner.rb
 - lib/glimmer-cs-gladiator.rb
+- lib/models/glimmer/gladiator/command.rb
 - lib/models/glimmer/gladiator/dir.rb
 - lib/models/glimmer/gladiator/file.rb
 - lib/views/glimmer/gladiator.rb