glimmer-cs-gladiator 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62cc5d4c7f27c15b95f6eaad4637a379a8729455532b8d924ce29a21be2c91c9
-  data.tar.gz: 43f501030aeca54b6a0339182ee0c064e81b0415a9cd440464950f89b6d83c6f
+  metadata.gz: 8d758e5b444ef3d48c0214ffb763e3dab3f9ca9748961e879b9ebdb626e9c2ea
+  data.tar.gz: cb575fbe30017319190278483334256aeb04d277798a5e3351f944c3d3a61481
 SHA512:
-  metadata.gz: 87353d484e3ab966ef765520ef4463831d37393fc66b5aa88f8dce389b001ef245f83af59e220d54f5fb18cd882f11e919cafda32db94ffc927cbbc086c33d35
-  data.tar.gz: 190d7ad3c6305a07763fc34187e12fc5c2bc6a1606f0a6ec8bef546eda63af1f6c38933c792e2f23fee9512948ddfef344ee352504d1d283ae2b1b8ba09be1c7
+  metadata.gz: 4223591b0608f621432a7ee1a1f710ad4a1684aaafb6d1d9152f064b8d707216ba3dc5fece5836764db058a9a88d209d161ee8abc5062d4fb9a4a821cb986c61
+  data.tar.gz: 3296674924ae085c139919e9e22a32d1c5a322b163b7fc6954e89bc02af4cb2a7c80e9a49359d9d136f4113206c48ebfcedbbe917e3f97e35529575abed1832a

data/README.md

@@ -1,4 +1,4 @@
-# Gladiator (Glimmer Editor) 0.1.5 - Glimmer Custom Shell
+# Gladiator (Glimmer Editor) 0.1.6 - 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,22 +9,29 @@ 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
+- 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
-- Kill Line(s)/selection
-- Move line/selection up
-- Move line/selection down
-- Comment/Uncomment line/selection
-- Indent/Unindent line/selection
+- 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
 
@@ -53,7 +60,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.5'
+gem 'glimmer-cs-gladiator', '0.1.6'
 ```
 
 Run:

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,16 +5,17 @@ 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 :line_numbers_content, :selection, :selection_count, :line_number, :find_text, :replace_text, :top_index, :path, :display_path
+      attr_reader :name, :dirty_content
   
       def initialize(path)
         raise "Not a file path: #{path}" unless ::File.file?(path)
         @display_path = path
         @name = ::File.basename(path)
         @path = ::File.expand_path(path)
-        @caret_position = 0
-        @line_number = 1
+        @top_index = 0
+        @selection_count = 0
+        @selection = Point.new(0, 0 + @selection_count)
         read_dirty_content = ::File.read(path)
         begin
           # test read dirty content
@@ -23,8 +24,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
@@ -38,7 +40,20 @@ module Glimmer
           # no op in case of a binary file
         end
       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
@@ -192,7 +207,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?(' ')
@@ -261,7 +276,7 @@ module Glimmer
             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)
+            occurrence_index = text_to_find_in&.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
@@ -315,10 +330,12 @@ 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
   
@@ -430,6 +447,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,6 +4,7 @@ rescue LoadError
   # no op
 end
 require 'fileutils'
+require 'os'
 
 require 'models/glimmer/gladiator/dir'
 require 'models/glimmer/gladiator/file'
@@ -19,6 +20,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,17 +36,17 @@ module Glimmer
       Display.setAppName('Gladiator')
       @display = display {
         on_event_keydown { |key_event|
-          if key_event.stateMask == swt(:command) && key_event.character.chr == 'f'
+          if key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'f'
             if @text_editor.text_widget.getSelectionText && @text_editor.text_widget.getSelectionText.size > 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 == '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 == '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 == 'w'
+          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
@@ -51,12 +54,12 @@ module Glimmer
             @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_event.character == 8721
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && key_event.character == 8721
             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_event.character.chr == 'w'
+          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
@@ -66,50 +69,50 @@ module Glimmer
                 @filter_text.swt_widget.setFocus
               else
                 @text_editor.text_widget.setFocus
-              end              
+              end
             end
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.character.chr == ']'
+          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 - 1].min) 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 == '['
+          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, 0].max) 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 == '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 == '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 == '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 == '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 == '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 == '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 == '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 == '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 == '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 == '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 == '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 == '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 == '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)
@@ -343,6 +346,9 @@ module Glimmer
                   @text_editor.text_widget.setFocus
                 end
               }
+              on_verify_text { |event|
+                event.doit = !event.text.match(/^\d*$/).to_a.empty? 
+              }
             }
             label {
               text 'Find:'
@@ -399,6 +405,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
   
@@ -512,5 +520,11 @@ module Glimmer
         }
       )
     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,31 +34,38 @@ 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')
             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 == '/'
+              if key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '/'
                 file.comment_line!
-              elsif key_event.stateMask == swt(:command) && key_event.character.chr.downcase == 'k'
+        	key_event.doit = false
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'k'
                 file.kill_line!
-              elsif key_event.stateMask == swt(:command) && key_event.character.chr.downcase == 'd'
+                key_event.doit = false
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'd'
                 file.duplicate_line!
-              elsif key_event.stateMask == swt(:command) && key_event.character.chr.downcase == '['
+                key_event.doit = false
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '['
                 file.outdent!
-              elsif key_event.stateMask == swt(:command) && key_event.character.chr.downcase == ']'
+                key_event.doit = false
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == ']'
                 file.indent!
-              elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.keyCode == swt(:cr)
+                key_event.doit = false
+              elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && key_event.keyCode == swt(:cr)
                 file.prefix_new_line!
-              elsif key_event.stateMask == swt(:command) && key_event.keyCode == swt(:cr)
+                key_event.doit = false
+              elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:cr)
                 file.insert_new_line!
+                key_event.doit = false
               elsif key_event.keyCode == swt(:page_up)
                 file.page_up
                 key_event.doit = false
@@ -71,10 +78,10 @@ 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)
+              elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_up)
                 file.move_up!
                 key_event.doit = false
-              elsif key_event.stateMask == swt(:command) && key_event.keyCode == swt(:arrow_down)
+              elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_down)
                 file.move_down!
                 key_event.doit = false
               end
@@ -98,6 +105,15 @@ module Glimmer
           }
         }
       }
+      
+      
+      def extract_char(event)
+        event.keyCode.chr
+      rescue => e
+        nil
+      end
+                                                                                                                                                                                                                                                                                                      
     end
   end
 end
+                                              

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.7.6
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.7.6
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: