glimmer-cs-gladiator 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1de235cba50741874f8719322e8c35ffea667929d465e23f3fd2df8a4866acb4
-  data.tar.gz: 20273095f8e93bff72840e3094ff5f203bc57bf78e0c7ee8b14e0765f7025ca5
+  metadata.gz: 1b17d21c81f04c1f1fc1ad516013d9e62a6abeb0900096b1bd13c95c6cf10ccd
+  data.tar.gz: 78d41ab949f3f40c71f2abfa26310a32f3720eecb64dcf5b90d2f155c2b35345
 SHA512:
-  metadata.gz: 5aba5bf9ad1ba8f077486dbc0d04da40c2138bf02c32d0565e27a520935da088d811e51bd9c90f868ce24c0775add77914e3dbebdfa4abb89f9333719f79cdcb
-  data.tar.gz: cbb76756dae0901141a3c3b2d69849d1aed409e26d1f7a8ff1fa30a410c3e11edfecd93c4ff03e35023aa2ee64a7dccad276878bb563f94c1298c144e93dfc4d
+  metadata.gz: bff6362c1eb4cc711c507ac90aa34e5a5b11653fe7b48f475bd829b37fdb1a87ca6b2317b35ff11f14f287aebfe2e35dee5e47ea2e9575f74c7b9971a1231b77
+  data.tar.gz: dc19f782cfb448e32f8054fee66797001af383cdcbedf26aeed3a3beaddef4309edefa4ca59c9be4192cd534d8a670bed35bd691ee458e3c5d22a43938e9d5e2

data/README.md

@@ -1,17 +1,20 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.2.2 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
-## [Glimmer Custom Shell](https://github.com/AndyObtiva/glimmer#custom-shell-gem)
+# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.4.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](https://github.com/AndyObtiva/glimmer) sample project under on-going development that demonstrates how to build a text editor in [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library).
+(Now, slightly less ugly with Ruby syntax highlighting colors)
+
+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).
 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 2020.
+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
@@ -30,18 +33,20 @@ Gladiator currently supports the following text editing features (including keyb
 - Indent/Unindent line/selection (CMD+] & CMD+[)
 - Insert/Prefix New Line (CMD+ENTER & CMD+SHIFT+ENTER)
 - Drag and Drop Text Editor Split Screen (drag a file from File Tree or File Lookup List, and it splits the screen)
+- Run current Ruby file via Run Menu (CMD+SHIFT+R)
+- Change Split Orientation to Horizontal/Vertical via View Menu (CMD+SHIFT+O)
 
 ## Platforms
 
-- Mac: Gladiator works best on the Mac.
-- Windows: Gladiator works well on Windows.
-- Linux: Gladiator works with handicaps on Linux (performing text editing operations causes scroll jitter)
+- Mac: Gladiator works best on the Mac. This is the platform it is most used on and receives the most maintenance for.
+- Windows: Gladiator works OK on Windows, but has some annoying bugs.
+- Linux: Gladiator works with very bad handicaps on Linux (performing text editing operations causes scroll jitter)
 
 ## Pre-requisites
 
-- [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)
+- [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library): '>= 4.17.2.0', '< 5.0.0.0' (dependency included in Ruby gem).
+- [JRuby](https://www.jruby.org/download): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer-dsl-swt)
+- [JDK](https://www.oracle.com/java/technologies/javase-downloads.html): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer-dsl-swt)
 
 ## Setup Instructions
 
@@ -73,6 +78,12 @@ You may run the `gladiator` command to bring up the text editor in the project d
 gladiator
 ```
 
+On Windows, you may need to run with extra memory via this command instead:
+
+```
+gladiator -J-Xmx3000M
+```
+
 If you are in a different directory from the project you would like to edit, then pass its path as an argument:
 
 ```
@@ -93,7 +104,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '~> 0.2.2'
+gem 'glimmer-cs-gladiator', '~> 0.4.0'
 ```
 
 Run:
@@ -102,7 +113,7 @@ Run:
 jruby -S bundle
 ```
 
-And, then instantiate the Gladiator [custom shell](https://github.com/AndyObtiva/glimmer#custom-shells) in your [Glimmer](https://github.com/AndyObtiva/glimmer) application via the `gladiator` keyword assuming you already have `include Glimmer` in your class, module, or main object.
+And, then instantiate the Gladiator [custom shell](https://github.com/AndyObtiva/glimmer-dsl-swt#custom-shells) in your [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) application via the `gladiator` keyword assuming you already have `include Glimmer` in your class, module, or main object.
 
 ## Env Var Options
 
@@ -125,7 +136,10 @@ It currently remembers:
 - Last opened file
 - Caret position
 - Top line position
+- Window size
 - Opened tabs
+- Split tabs
+- Ignore Paths
 
 ## Gotcha
 
@@ -152,11 +166,12 @@ The signal TERM is in use by the JVM and will not work correctly on this platfor
 
 ## Copyright
 
-Copyright (c) 2020 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for
-further details.
+[MIT](https://opensource.org/licenses/MIT)
+
+Copyright (c) 2020 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for further details.
 
 --
 
-Built with [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library).
+[<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>

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.4.0

data/lib/glimmer-cs-gladiator.rb

@@ -4,3 +4,26 @@ require 'filewatcher'
 require 'clipboard'
 require 'puts_debuggerer'
 require 'views/glimmer/gladiator'
+
+# Custom Composite Initializer (avoid default margins)
+Glimmer::SWT::WidgetProxy::DEFAULT_INITIALIZERS['composite'] = lambda do |composite|
+  if composite.get_layout.nil?
+    layout = GridLayout.new
+    composite.layout = layout
+  end
+end
+
+# Custom LayoutProxy initialize method (avoid default margins)
+module Glimmer
+  module SWT
+    class LayoutProxy
+      def initialize(underscored_layout_name, widget_proxy, args)
+        @underscored_layout_name = underscored_layout_name
+        @widget_proxy = widget_proxy
+        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

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

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

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

@@ -9,32 +9,44 @@ module Glimmer
   
       class << self
         def local_dir
-          @local_dir ||= new(ENV['LOCAL_DIR'] || '.').tap do |dir|
-            dir.refresh
-            @filewatcher = Filewatcher.new(dir.path)
+          unless @local_dir
+            @local_dir = new(ENV['LOCAL_DIR'] || '.', true)
+#             @local_dir.refresh
+            @filewatcher = Filewatcher.new(@local_dir.path)
             @thread = Thread.new(@filewatcher) do |fw| 
               fw.watch do |filename, event|
                 if @last_update.nil? || (Time.now.to_f - @last_update) > REFRESH_DELAY
-                  dir.refresh if !filename.include?('new_file') && !dir.selected_child_path_history.include?(filename) && filename != dir.selected_child_path
+                  @local_dir.refresh if !filename.include?('new_file') && !@local_dir.selected_child_path_history.include?(filename) && filename != @local_dir.selected_child_path
                 end
                 @last_update = Time.now.to_f
               end
             end
           end
+          @local_dir
         end        
       end
   
-      attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :path, :display_path
-      attr_reader :name, :parent
-      attr_writer :all_children, :children
+      attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :display_path, :ignore_paths
+      attr_reader :name, :parent, :path, :is_local_dir
+      attr_writer :all_children
   
-      def initialize(path)
-        @display_path = path
-        @path = ::File.expand_path(@display_path)
+      def initialize(path, is_local_dir = false)
+        @is_local_dir = is_local_dir
+        self.path = ::File.expand_path(path)
         @name = ::File.basename(::File.expand_path(path))
+        @ignore_paths = ['packages', 'tmp', 'vendor']
         self.filtered_path_options = []
       end
 
+      def path=(the_path)
+        @path = the_path
+        generate_display_path
+      end
+      
+      def generate_display_path
+        is_local_dir ? path : @display_path = @path.sub(Dir.local_dir.path, '').sub(/^\//, '')
+      end
+      
       def name=(the_name)
         self.display_path = display_path.sub(/#{Regexp.escape(@name)}$/, the_name)
         @name = the_name
@@ -48,7 +60,20 @@ module Glimmer
       end
 
       def retrieve_children
-        ::Dir.glob(::File.join(@display_path, '*')).map {|p| ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)}.sort_by {|c| c.path.to_s.downcase }.sort_by {|c| c.class.name }
+        @children = ::Dir.glob(::File.join(@path, '*')).reject do |p|
+          # TODO make sure to configure ignore_paths in a preferences dialog 
+          Dir.local_dir.ignore_paths.reduce(false) do |result, ignore_path|
+            result || p.include?(ignore_path)
+          end
+        end.map do |p| 
+          ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)
+        end.sort_by do |c| 
+          c.path.to_s.downcase 
+        end.sort_by do |c| 
+          c.class.name
+        end.each do |child|
+          child.retrieve_children if child.is_a?(Dir)
+        end
       end
   
       def selected_child_path_history
@@ -65,11 +90,11 @@ module Glimmer
 
       def refresh(async: true, force: false)
         return if @refresh_paused && !force
-        new_all_children = retrieve_all_children
-        new_children = retrieve_children
+        retrieve_children
+        collect_all_children
         refresh_operation = lambda do
-          self.all_children = new_all_children
-          self.children = new_children
+          notify_observers(:children)
+          notify_observers(:all_children)
         end
         if async
           async_exec(&refresh_operation)
@@ -84,23 +109,31 @@ module Glimmer
         else
           @filter = value
         end
-        self.filtered_path_options = filtered.to_a.map(&:display_path)
+        @last_filtered = filtered.to_a
+        self.filtered_path_options = @last_filtered.map(&:display_path)
+        @last_filter = @filter
       end
   
       def filtered
         return if filter.nil?
-        all_children_files.select do |child| 
-          child.path.downcase.include?(filter.downcase) ||
-            child.path.downcase.gsub(/[_\/\.]/, '').include?(filter.downcase)
+        children_files = !@last_filter.to_s.empty? && filter.downcase.start_with?(@last_filter.downcase) ? @last_filtered : all_children_files
+        children_files.select do |child| 
+          child_path = child.path.to_s.sub(Dir.local_dir.path, '')
+          child_path.downcase.include?(filter.downcase) ||
+            child_path.downcase.gsub(/[_\/.-]/, '').include?(filter.downcase.gsub(/[_\/.-]/, ''))
         end.sort_by {|c| c.path.to_s.downcase}
       end
   
       def all_children
-        @all_children ||= retrieve_all_children
+        @all_children ||= collect_all_children
       end
   
-      def retrieve_all_children
-        ::Dir.glob(::File.join(@display_path, '**', '*')).map {|p| ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)}
+      def collect_all_children
+        @all_children = children.reduce([]) do |output, child|
+          addition = [child]
+          addition += child.collect_all_children if child.is_a?(Dir)
+          output + addition
+        end
       end
   
       def all_children_files
@@ -108,9 +141,11 @@ module Glimmer
       end
   
       def selected_child_path=(selected_path)
+        full_selected_path = selected_path.include?(Dir.local_dir.path) ? selected_path : ::File.join(Dir.local_dir.path, selected_path)
         return if selected_path.nil? || 
-                  ::Dir.exist?(selected_path) || 
-                  (selected_child && ::File.expand_path(selected_child.path) == ::File.expand_path(selected_path))
+                  ::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)

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

@@ -5,16 +5,15 @@ module Glimmer
     class File
       include Glimmer
   
-      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
-  
+      attr_accessor :dirty_content, :line_numbers_content, :selection, :line_number, :find_text, :replace_text, :top_pixel, :display_path, :case_sensitive
+      attr_reader :name, :path
+
       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
+        self.path = ::File.expand_path(path)
+        @top_pixel = 0
         @selection_count = 0
         @selection = Point.new(0, 0 + @selection_count)
         read_dirty_content = ::File.read(path)
@@ -42,10 +41,22 @@ module Glimmer
         end
       end
       
+      def path=(the_path)
+        @path = the_path
+        generate_display_path
+      end
+      
+      def generate_display_path
+        @display_path = @path.sub(Dir.local_dir.path, '').sub(/^\//, '')      
+      end
+      
       # to use for widget data-binding
       def content=(value)
-        Command.do(self) # record a native (OS-widget) operation
-        self.dirty_content = value
+        value = value.gsub("\t", '  ')
+        if dirty_content != value
+          Command.do(self) # record a native (OS-widget) operation
+          self.dirty_content = value
+        end
       end
 
       def content
@@ -53,24 +64,30 @@ module Glimmer
       end
 
       def caret_position=(value)
+        old_top_pixel = top_pixel
         self.selection = Point.new(value, value + selection_count.to_i)
-        if OS.linux?
-          async_exec do
-            self.top_index = line_index_for_caret_position(value)
-          end
-        end
+        self.top_pixel = old_top_pixel
       end
       
       def caret_position
         selection.x
       end
+
+      def selection_count
+        selection.y - selection.x
+      end
       
+      def selection_count=(value)
+        self.selection = Point.new(caret_position, caret_position + value.to_i)
+      end      
+                  
       def name=(the_name)
-        self.display_path = display_path.sub(/#{Regexp.escape(@name)}$/, the_name)
+        new_path = path.sub(/#{Regexp.escape(@name)}$/, the_name)
         @name = the_name
-        new_path = ::File.expand_path(display_path)
-        FileUtils.mv(path, new_path)
-        self.path = new_path
+        if ::File.exists?(path)
+          FileUtils.mv(path, new_path)
+          self.path = new_path
+        end
       end
       
       def dirty_content=(the_content)
@@ -126,10 +143,10 @@ module Glimmer
         current_line.to_s.match(/^(\s+)/).to_a[1].to_s
       end
 
-      def current_line
+      def current_line      
         lines[line_number - 1]
       end
-      
+
       def delete!
         FileUtils.rm(path)        
       end
@@ -201,8 +218,9 @@ module Glimmer
         old_caret_position = self.caret_position
         self.dirty_content = new_lines.join("\n")   
         if old_selection_count.to_i > 0
-          self.caret_position = caret_position_for_line_index(old_caret_position_line_index)
-          self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
+          caret_position_value = caret_position_for_line_index(old_caret_position_line_index)
+          selection_count_value = (caret_position_for_line_index(old_end_caret_line_index + 1) - caret_position_value)
+          self.selection = Point.new(caret_position_value, caret_position_value + selection_count_value)
         else
           self.caret_position = old_caret_position + delta
         end
@@ -230,8 +248,9 @@ module Glimmer
         end
         self.dirty_content = new_lines.join("\n")   
         if old_selection_count.to_i > 0
-          self.caret_position = caret_position_for_line_index(old_caret_position_line_index)
-          self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
+          caret_position_value = caret_position_for_line_index(old_caret_position_line_index)
+          selection_count_value = (caret_position_for_line_index(old_end_caret_line_index + 1) - caret_position_value)
+          self.selection = Point.new(caret_position_value, caret_position_value + selection_count_value)
         else
           new_caret_position = old_caret_position + delta
           new_caret_position = [new_caret_position, old_caret_position_line_caret_position].max
@@ -281,7 +300,7 @@ module Glimmer
         all_lines = lines
         the_line_index = line_index_for_caret_position(caret_position)
         line_position = line_position_for_caret_position(caret_position)
-        found = 
+        found = found_text?(caret_position)
         2.times do |i|
           rotation = the_line_index
           all_lines.rotate(rotation).each_with_index do |the_line, the_index|
@@ -293,6 +312,7 @@ module Glimmer
             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
+              self.selection = Point.new(self.caret_position, self.caret_position + self.selection_count)
               return
             end
           end
@@ -339,7 +359,8 @@ module Glimmer
         new_dirty_content = dirty_content
         new_dirty_content[caret_position, find_text.size] = replace_text.to_s
         self.dirty_content = new_dirty_content
-        find_next
+        find_next       
+        find_next if replace_text.to_s.include?(find_text) && !replace_text.to_s.start_with?(find_text)
       end
   
       def page_up

data/lib/views/glimmer/gladiator.rb

@@ -15,12 +15,13 @@ module Glimmer
   class Gladiator
     include Glimmer::UI::CustomShell
     
+    APP_ROOT = ::File.expand_path('../../../..', __FILE__)  
     COMMAND_KEY = OS.mac? ? :command : :ctrl
 
     class << self
       attr_accessor :drag_and_drop
       attr_accessor :drag
-    end    
+    end
 
     ## Add options like the following to configure CustomShell by outside consumers
     #
@@ -28,6 +29,8 @@ module Glimmer
     # option :width, 320
     # option :height, 240
     
+    attr_accessor :split_orientation
+    
     ## Uncomment before_body block to pre-initialize variables to use in body
     #
     #
@@ -72,6 +75,8 @@ module Glimmer
                 @text_editor&.text_widget&.setFocus
               end
             end
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'o'
+            self.split_orientation = split_orientation == swt(:horizontal) ? swt(:vertical) : swt(:horizontal)
           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
@@ -132,10 +137,10 @@ module Glimmer
           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) && extract_char(key_event) == 'r'
+          elsif key_event.stateMask == swt(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) && extract_char(key_event) == 't'
+          elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 't'
             select_tree_item unless @rename_in_progress
             @tree.swt_widget.setFocus
           elsif key_event.keyCode == swt(:esc)
@@ -147,10 +152,12 @@ module Glimmer
         }
       }
 
+      @split_orientation = swt(:horizontal)
       local_dir = ENV['LOCAL_DIR'] || '.'
       @config_file_path = ::File.join(local_dir, '.gladiator')
       @config = {}
-      Dir.local_dir.all_children # pre-caches children
+      load_config_ignore_paths
+#       Dir.local_dir.all_children # pre-caches children            
     }
 
     ## Uncomment after_body block to setup observers for widgets in body
@@ -222,7 +229,7 @@ module Glimmer
       observe(Dir.local_dir, 'selected_child.caret_position') do
         save_config
       end
-      observe(Dir.local_dir, 'selected_child.top_index') do
+      observe(Dir.local_dir, 'selected_child.top_pixel') do
         save_config
       end
       load_config
@@ -236,7 +243,12 @@ module Glimmer
         text "Gladiator - #{::File.expand_path(Dir.local_dir.path)}"
         minimum_size 520, 250
         size 1440, 900 
-        grid_layout 2, false
+        grid_layout(2, false)
+        on_swt_show {
+          swt_widget.setSize(@config[:shell_width], @config[:shell_height]) if @config[:shell_width] && @config[:shell_height]
+          swt_widget.setLocation(@config[:shell_x], @config[:shell_y]) if @config[:shell_x] && @config[:shell_y]          
+          @loaded_config = true
+        }
         on_swt_close {
           Dir.local_dir.selected_child&.write_dirty_content
         }
@@ -252,6 +264,46 @@ module Glimmer
         on_shell_deactivated {
           @text_editor&.file&.write_dirty_content
         }        
+
+        menu_bar {
+          menu {
+            text '&View'
+            menu {
+              text '&Split'
+              menu_item(:radio) {
+                text '&Horizontal'
+                selection bind(self, :split_orientation, on_read: ->(o) { o == swt(:horizontal)}, on_write: ->(b) { b ? swt(:horizontal) : swt(:vertical)})
+              }
+              menu_item(:radio) {
+                text '&Vertical'
+                selection bind(self, :split_orientation, on_read: ->(o) { o == swt(:vertical)}, on_write: ->(b) { b ? swt(:vertical) : swt(:horizontal)})
+              }
+            }
+          }
+          menu {
+            text '&Run'
+#             menu_item {
+#               text 'Launch Glimmer &App'
+#               on_widget_selected {
+#                 parent_path = Dir.local_dir.path
+##                 current_directory_name = ::File.basename(parent_path)
+##                 assumed_shell_script = ::File.join(parent_path, 'bin', current_directory_name)      
+##                 assumed_shell_script = ::Dir.glob(::File.join(parent_path, 'bin', '*')).detect {|f| ::File.file?(f) && !::File.read(f).include?('#!/usr/bin/env')} if !::File.exist?(assumed_shell_script)
+##                 load assumed_shell_script
+#                 FileUtils.cd(parent_path) do
+#                   system 'glimmer run'
+#                 end
+#               }
+#             }
+            menu_item {
+              text '&Current File'
+              on_widget_selected {
+                load Dir.local_dir.selected_child.path
+              }
+            }
+          }
+        }
+
         composite {
           grid_layout 1, false
           layout_data(:fill, :fill, false, true) {
@@ -389,9 +441,13 @@ module Glimmer
             
             # row 1
             
+            label {
+              text 'File:'
+            }
+
             @file_path_label = styled_text(:none) {
               layout_data(:fill, :fill, true, false) {
-                horizontal_span 3
+                horizontal_span 2
               }
               background color(:widget_background)
               editable false
@@ -432,7 +488,7 @@ module Glimmer
               text 'Find:'
             }
             @find_text = text {
-              layout_data(:fill, :fill, true, false) {
+              layout_data(:fill, :center, true, false) {
                 minimum_width 400
               }
               text bind(Dir.local_dir, 'selected_child.find_text')
@@ -490,6 +546,7 @@ module Glimmer
               height_hint 480
             }
             sash_width 10
+            orientation bind(self, :split_orientation)
             @tab_folder = tab_folder {
               drag_source(DND::DROP_COPY) {
                 transfer [TextTransfer.getInstance].to_java(Transfer)
@@ -511,22 +568,39 @@ module Glimmer
       }
     }
     
+    def load_config_ignore_paths
+      # TODO eliminate duplication with load_config
+      if ::File.exists?(@config_file_path)
+        config_yaml = ::File.read(@config_file_path)
+        return if config_yaml.to_s.strip.empty?
+        @config = YAML.load(config_yaml)
+        Dir.local_dir.ignore_paths = @config[:ignore_paths] if @config[:ignore_paths]
+        Dir.local_dir.ignore_paths ||= ['packages', 'tmp']
+      else
+        @loaded_config = true
+      end
+    end
+    
     def load_config
       if ::File.exists?(@config_file_path)
         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|
+        Dir.local_dir.ignore_paths = @config[:ignore_paths] if @config[:ignore_paths]
+        Dir.local_dir.ignore_paths ||= ['packages', 'tmp']
+        open_file_paths1 = @config[:open_file_paths1] || @config[:open_file_paths]
+        open_file_paths2 = @config[:open_file_paths2]
+        open_file_paths1.to_a.each do |file_path|
+          Dir.local_dir.selected_child_path = file_path
+        end
+        Gladiator.drag = true
+        open_file_paths2.to_a.each do |file_path|
           Dir.local_dir.selected_child_path = file_path
         end
+        Gladiator.drag = false
         Dir.local_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path]
         Dir.local_dir.selected_child&.caret_position  = Dir.local_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
-        Dir.local_dir.selected_child&.top_index = @config[:top_index].to_i if @config[:top_index]
-        body_root.on_swt_show {
-          swt_widget.setSize(@config[:shell_width], @config[:shell_height]) if @config[:shell_width] && @config[:shell_height]
-          swt_widget.setLocation(@config[:shell_x], @config[:shell_y]) if @config[:shell_x] && @config[:shell_y]          
-          @loaded_config = true
-        }
+        Dir.local_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
       else
         @loaded_config = true
       end
@@ -536,15 +610,21 @@ module Glimmer
       return unless @loaded_config
       child = Dir.local_dir.selected_child
       return if child.nil?
+      tab_folder1 = @tab_folder1 || @tab_folder
+      tab_folder2 = @tab_folder2
+      open_file_paths1 = tab_folder1&.swt_widget&.items.to_a.map {|i| i.get_data('file_path')}
+      open_file_paths2 = tab_folder2&.swt_widget&.items.to_a.map {|i| i.get_data('file_path')}
       @config = {
         selected_child_path: child.path,
         caret_position: child.caret_position,
-        top_index: child.top_index,
+        top_pixel: child.top_pixel,
         shell_width: swt_widget&.getBounds&.width,
         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,
+        open_file_paths1: open_file_paths1,
+        open_file_paths2: open_file_paths2,
+        ignore_paths: Dir.local_dir.ignore_paths
       }
       config_yaml = YAML.dump(@config)
       ::File.write(@config_file_path, config_yaml) unless config_yaml.to_s.empty?
@@ -644,6 +724,7 @@ module Glimmer
       end
       new_file_path = ::File.expand_path(::File.join(directory_path, 'new_file'))
       FileUtils.touch(new_file_path)
+      # TODO look into refreshing only the parent directory to avoid slowdown
       Dir.local_dir.refresh(async: false, force: true)
       new_tree_item = @tree.depth_first_search {|ti| ti.getData.path == new_file_path}.first
       @tree.swt_widget.showItem(new_tree_item)

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

@@ -16,13 +16,13 @@ module Glimmer
         composite {
           layout_data :fill, :fill, true, true
           grid_layout 2, false
-          @line_numbers_text = text(:multi) {
+          @line_numbers_text = code_text(:border, :multi) {
             layout_data(:right, :fill, false, true)
             font name: 'Consolas', height: OS.mac? ? 15 : 12
             background color(:widget_background)
             foreground rgb(75, 75, 75)
             text bind(file, 'line_numbers_content')
-            top_index bind(file, 'top_index', read_only: true)
+            top_pixel bind(file, 'top_pixel', read_only: true)
             on_focus_gained {
               @text&.swt_widget.setFocus
             }
@@ -33,15 +33,15 @@ module Glimmer
               @text&.swt_widget.setFocus
             }
           }
-          @text = text(:multi, :border, :h_scroll, :v_scroll) {
+          
+          @text = code_text {
             layout_data :fill, :fill, true, true
             font name: 'Consolas', height: OS.mac? ? 15 : 12
             foreground rgb(75, 75, 75)
             text bind(file, :content)
             focus true
-            selection bind(file, 'selection')
-            selection_count bind(file, 'selection_count')
-            top_index bind(file, 'top_index')
+            selection bind(file, :selection)
+            top_pixel bind(file, :top_pixel)
             drop_target(DND::DROP_COPY) {
               transfer [TextTransfer.getInstance].to_java(Transfer)
               on_drag_enter { |event|
@@ -57,12 +57,21 @@ module Glimmer
             
             on_focus_lost {
               file&.write_dirty_content
-            }
-      	     on_key_pressed { |key_event|
+            }              
+            on_verify_key { |key_event|
               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 Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'r'
+                Dir.local_dir.selected_child.write_dirty_content              
+                begin
+                  load Dir.local_dir.selected_child.path
+                rescue => e
+                  puts e.full_message
+                end
               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) == 'a'
+                key_event.widget.selectAll
               elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '/'
                 Command.do(file, :comment_line!)
                 key_event.doit = false
@@ -105,13 +114,13 @@ module Glimmer
               end
             }
             on_verify_text { |verify_event|
-              key_code = verify_event.keyCode
-              case key_code
-              when swt(:cr)
+              # TODO convert these into File commands to support Undo/Redo                             
+              case verify_event.text
+              when "\n"
                 if file.selection_count.to_i == 0
                   verify_event.text += file.current_line_indentation
                 end
-              when swt(:tab)
+              when "\t"
                 if file.selection_count.to_i > 0
                   Command.do(file, :indent!)
                   verify_event.doit = false

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 4.17.4.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 5.0.0.0
   name: glimmer-dsl-swt
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 4.17.4.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 5.0.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -37,8 +37,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.1
   name: filewatcher
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -51,8 +51,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.4
   name: clipboard
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -65,8 +65,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
   name: rspec
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -79,8 +79,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.9
   name: jeweler
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -93,8 +93,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: simplecov
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Gladiator (Glimmer Editor) - Glimmer Custom Shell