glimmer-cs-gladiator 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d31e7dd5189317eaeb3a91a175a050ffaaeb4e82d6c8709167477d26dd7bf237
-  data.tar.gz: 370a540665a9d7f3d08154f1e98530521f72e9a720f35fa83f982747e2e5bf5e
+  metadata.gz: 686df61b4e15ac85a1cc5d08cb3e83f088bce3a40b2a6e155101f657189075f3
+  data.tar.gz: 12874887ef0d8a846ef43d5eb89ad2d1ec184fe3d0171a4cf692a1f9348efe61
 SHA512:
-  metadata.gz: 7af2ad9407c442ad6634a843ad3b5fc6cac47dadbd84ec0dc0b19f8d38b858950648a951383be811f040232ab426cbf0dffc1ad1d003a33a6a3cefd07d6c6832
-  data.tar.gz: a9d30dc68de3f7de8fa25c9860c57885892e4ceeea734c63bc4fd2b257736afc0e1b0c7a062d03af93991d03d05907dbfbe058adcf6e13d695ce524167ce5aef
+  metadata.gz: 8816804e0a23b860d98b6f583dba265cafac70ce3960b297f5c99dfa6de27d55441c5f959378d4851901e7cf059ec565bdbfc5911c114e8f41e250191f4b27fb
+  data.tar.gz: 288eccb3f7edbd055d54c0f05d9878a1630c057ca1f7464f7ecb586e5a632d33466197511f0e564900816dbb0b76b3a86ddc743d0fb0d60763a776ef592eb9d2

data/README.md

@@ -1,4 +1,4 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.5.4 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
+# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.6.0 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
 ## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer Custom Shell](https://github.com/AndyObtiva/glimmer-dsl-swt#custom-shell-gem)
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
@@ -11,21 +11,14 @@ I leave building truly professional text editors to software tooling experts who
 
 ## Features
 
-Gladiator currently supports the following text editing features (including keyboard shortcuts with Mac CMD=CTRL on Windows/Linux):
-- Ruby Syntax Highlighting with colors
-- Open Project from File Menu (CMD+SHIFT+P)
-- Scratchpad for running arbitrary Ruby/Glimmer code without saving to disk (CMD+SHIFT+S)
-- Run Ruby code (CMD+SHIFT+R)
-- File explorer navigation with context menu to open file, rename, delete, add new file, add new directory, or refresh tree (CMD+T)
-- File lookup by name ignoring slashes, underscores, and dots to ease lookup (CMD+R)
-- Watch open file for external changes to automatically refresh in editor
-- Watch project subdirectories for changes to automatically refresh in file explorer/file lookup
-- Find & Replace (CMD+F)
+Gladiator currently supports the following text editing features (including keyboard shortcuts with Mac CMD=CTRL on Windows/Linux)
+
+### Text Editor
+
+- Text Editor with Colored Ruby Syntax Highlighting
 - Show Line Numbers
-- Jump to Line (CMD+L)
-- Multiple tab support (CMD+SHIFT+[ & CMD+SHIFT+] for tab navigation. CMD+1-9 to jump to a specific tab)
-- Remember opened tabs, caret position, top line, window size, and window location
-- Autosave on focus out/quit/open new file
+- Multi-tab support (CMD+SHIFT+[ & CMD+SHIFT+] for tab navigation. CMD+1-9 to jump to a specific tab)
+- Drag and drop split pane (drag a file from File Tree or File Lookup List, and it splits the pane)
 - Duplicate Line(s)/selection (CMD+D)
 - Kill Line(s)/selection (CMD+K)
 - Move line/selection up (CMD+UP)
@@ -33,8 +26,41 @@ Gladiator currently supports the following text editing features (including keyb
 - Comment/Uncomment line/selection (CMD+/)
 - Indent/Unindent line/selection (CMD+] & CMD+[)
 - Insert/Prefix New Line (CMD+ENTER & CMD+SHIFT+ENTER)
-- Split Pane & Change Split Orientation to Horizontal/Vertical via View Menu (CMD+SHIFT+O)
-- Drag and Drop Text Editor Split Screen (drag a file from File Tree or File Lookup List, and it splits the pane)
+
+### File Explorer Tree
+
+- Collapsable file explorer tree listing files and directories for open project
+- Context menu to open file, rename, delete, add new file, add new directory, and refresh tree
+- Jump to open file in tree (CMD+T)
+
+### File Lookup List Filter
+
+- Collapsable file lookup list filter (CMD+R)
+- Semi-fuzzy filtering by ignoring slashes, underscores, and dots to ease lookup 
+
+### Navigation Area
+
+- Show current text editor file name
+- Show file navigation stats (Caret Position / Line Position / Selection Count / Top Pixel)
+- Jump to Line (CMD+L)
+- Find & Replace (CMD+F)
+
+### Menus
+
+- File Menu to Open Project (CMD+SHIFT+P) and open Scratchpad for running arbitrary Ruby/Glimmer code without saving to disk (CMD+SHIFT+S)
+- View Menu to Split Pane & Change Split Orientation to Horizontal/Vertical (CMD+SHIFT+O)
+- Run Menu to run Ruby code (CMD+SHIFT+R)
+
+### Watch External Changes
+
+- Watch open file for external changes to automatically refresh in editor
+- Watch project subdirectories for changes to automatically refresh in file explorer/file lookup
+
+### Automatic Data Management
+
+- Autosave on focus out/quit/open new file
+- Remember opened tabs, caret position, top pixel, window size, and window location
+- [Default](#configuration) "ignore paths" to avoid bogging down editor with irrelevant directory files
 
 ## Platforms
 
@@ -110,7 +136,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '~> 0.5.4'
+gem 'glimmer-cs-gladiator', '~> 0.6.0'
 ```
 
 Run:
@@ -136,7 +162,7 @@ Opens Gladiator with "/Users/User/code" as the root directory.
 
 ## Configuration
 
-Gladiator automatically saves configuration data in a `.gladiator` file at the directory it is run from.
+Gladiator automatically saves configuration data in a `.gladiator` file at the directory it is run from. It may be edited to add extra ignore paths.
 
 It currently remembers:
 - Last opened files (in both split panes if split)
@@ -176,4 +202,4 @@ Copyright (c) 2020 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for further detail
 
 [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 />](https://github.com/AndyObtiva/glimmer) Built with [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library)
 
-Gladiator icon made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a>
+Gladiator icon made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a>

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.6.0

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

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

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

@@ -219,7 +219,7 @@ module Glimmer
       def eql?(other)
         self.path.eql?(other&.path)
       end
-      
+
       def hash
         self.path.hash
       end

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

@@ -3,7 +3,7 @@ module Glimmer
     class File
       include Glimmer
 
-      attr_accessor :line_numbers_content, :selection, :line_number, :find_text, :replace_text, :top_pixel, :display_path, :case_sensitive
+      attr_accessor :line_numbers_content, :line_number, :find_text, :replace_text, :top_pixel, :display_path, :case_sensitive, :caret_position, :selection_count, :last_caret_position, :last_selection_count, :line_position
       attr_reader :name, :path, :project_dir
 
       def initialize(path='', project_dir=nil)
@@ -13,9 +13,11 @@ module Glimmer
         @name = path.empty? ? 'Scratchpad' : ::File.basename(path)
         self.path = ::File.expand_path(path) unless path.empty?
         @top_pixel = 0
+        @caret_position = 0
         @selection_count = 0
-        @selection = Point.new(0, 0 + @selection_count)
+        @last_selection_count = 0
         @line_number = 1
+        @init = nil
       end
       
       def init_content
@@ -24,29 +26,28 @@ module Glimmer
           begin
             # test read dirty content
             observe(self, :dirty_content) do
-              lines_text_size = lines.size.to_s.size
+              line_count = lines.empty? ? 1 : lines.size
+              lines_text_size = [line_count.to_s.size, 4].max
               old_top_pixel = top_pixel
-              self.line_numbers_content = lines.size.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n")
+              self.line_numbers_content = line_count.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n")
               self.top_pixel = old_top_pixel
             end
             the_dirty_content = read_dirty_content
             the_dirty_content.split("\n") # test that it is not a binary file (crashes to rescue block otherwise)
             self.dirty_content = the_dirty_content
-            observe(self, :selection) do
+            observe(self, :caret_position) do |new_caret_position|
               new_line_number = line_index_for_caret_position(caret_position) + 1
-              async_exec {
-                self.line_number = new_line_number
-              }
+              current_line_number = line_number
+              self.line_number = new_line_number unless current_line_number && current_line_number == new_line_number
+              self.line_position = caret_position - caret_position_for_line_index(line_number - 1) + 1
             end
-            observe(self, :line_number) do
-              if line_number
-                line_index = line_number - 1
-                new_caret_position = caret_position_for_line_index(line_index)
-                current_caret_position = self.caret_position
-                async_exec {
-                  self.caret_position = new_caret_position unless current_caret_position && line_index_for_caret_position(new_caret_position) == line_index_for_caret_position(current_caret_position)
-                }
-              end
+            observe(self, :line_number) do |new_line_number|
+              line_index = line_number - 1
+              new_caret_position = caret_position_for_line_index(line_index)
+              current_caret_position = caret_position
+              line_index_for_new_caret_position = line_index_for_caret_position(new_caret_position)
+              line_index_for_current_caret_position = line_index_for_caret_position(current_caret_position)
+              self.caret_position = new_caret_position unless (current_caret_position && line_index_for_new_caret_position == line_index_for_current_caret_position)
             end
           rescue # in case of a binary file
             stop_filewatcher
@@ -63,6 +64,15 @@ module Glimmer
         return if @path.empty?
         @display_path = @path.sub(project_dir.path, '').sub(/^\//, '')
       end
+
+      def name=(the_name)
+        new_path = path.sub(/#{Regexp.escape(@name)}$/, the_name) unless scratchpad?
+        @name = the_name
+        if !scratchpad? && ::File.exist?(path)
+          FileUtils.mv(path, new_path)
+          self.path = new_path
+        end
+      end
       
       def scratchpad?
         path.to_s.empty?
@@ -80,48 +90,18 @@ module Glimmer
           send("#{property}=", value)
         end
       end
-
-      # to use for widget data-binding
-      def content=(value)
-        value = value.gsub("\t", '  ')
-        if dirty_content != value
-          # TODO fix this command recording hack by truly recording every text change as a proper command (add process_key command, paste command, cut command, etc...)
-          Command.do(self) # record a native (OS-widget) operation
-          self.dirty_content = value
-        end
-      end
-
-      def content
-        dirty_content
-      end
-
+      
       def caret_position=(value)
-        old_top_pixel = top_pixel
-        self.selection = Point.new(value, value + selection_count.to_i)
-        self.top_pixel = old_top_pixel
-      end
-
-      def caret_position
-        selection.x
-      end
-
-      def selection_count
-        selection.y - selection.x
+        @last_caret_position = @caret_position
+        @caret_position = value
       end
 
       def selection_count=(value)
-        self.selection = Point.new(caret_position, caret_position + value.to_i)
+        #@last_selection_count = @selection_count
+        @selection_count = value
+        @last_selection_count = @selection_count
       end
 
-      def name=(the_name)
-        new_path = path.sub(/#{Regexp.escape(@name)}$/, the_name) unless scratchpad?
-        @name = the_name
-        if !scratchpad? && ::File.exist?(path)
-          FileUtils.mv(path, new_path)
-          self.path = new_path
-        end
-      end
-      
       def dirty_content
         init_content
         @dirty_content
@@ -132,14 +112,49 @@ module Glimmer
         @dirty_content = the_content
         old_caret_position = caret_position
         old_top_pixel = top_pixel
+        
         notify_observers(:content)
         if @formatting_dirty_content_for_writing
           self.caret_position = old_caret_position
-          self.selection_count = 0
           self.top_pixel = old_top_pixel
         end
       end
       
+      def content
+        dirty_content
+      end
+
+      # to use for widget data-binding
+      def content=(value)
+        value = value.gsub("\t", '  ')
+        if dirty_content != value
+          Command.do(self, :change_content!, value)
+        end
+      end
+      
+      def change_content!(value)
+        self.dirty_content = value
+      end
+
+      def start_command
+        @commmand_in_progress = true
+      end
+      
+      def end_command
+        @commmand_in_progress = false
+      end
+      
+      def command_in_progress?
+        @commmand_in_progress
+      end
+      
+      def close
+        stop_filewatcher
+        remove_all_observers
+        initialize(path, project_dir)
+        Command.clear(self)
+      end
+      
       def read_dirty_content
         path.empty? ? '' : ::File.read(path)
       end
@@ -176,7 +191,9 @@ module Glimmer
       end
 
       def format_dirty_content_for_writing!
-        new_dirty_content = dirty_content.split("\n").map {|line| line.strip.empty? ? line : line.rstrip }.join("\n")
+        return if @commmand_in_progress
+        # TODO  f ix c ar e t pos it ion after formatting dirty content (diff?)
+        new_dirty_content = dirty_content.to_s.split("\n").map {|line| line.strip.empty? ? line : line.rstrip }.join("\n")
         new_dirty_content = "#{new_dirty_content.gsub("\r\n", "\n").gsub("\r", "\n").sub(/\n+\z/, '')}\n"
         if new_dirty_content != self.dirty_content
           @formatting_dirty_content_for_writing = true

data/lib/views/glimmer/gladiator.rb

@@ -76,6 +76,7 @@ module Glimmer
         }
       end
 
+      @default_foreground = :dark_blue
       @split_orientation = swt(:horizontal)
       @config_file_path = ::File.join(project_dir.path, '.gladiator')
       @config = {}
@@ -109,7 +110,10 @@ module Glimmer
             @current_tab_folder.content {
               @current_tab_item = tab_item { |the_tab_item|
                 text selected_file.name
-                fill_layout :horizontal
+                fill_layout(:horizontal) {
+                 margin_width 0
+                 margin_height 0
+                }
                 @current_text_editor = the_text_editor = text_editor(project_dir: project_dir, file: selected_file)
                 @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
                 @current_text_editor.text_proxy.content {
@@ -134,6 +138,9 @@ module Glimmer
                     @current_text_editor&.text_widget&.setFocus
                   }
                 }
+                on_widget_disposed {
+                  the_tab_item.swt_tab_item.get_data('file').close
+                }                
               }
               @current_tab_item.swt_tab_item.setData('file_path', selected_file.path)
               @current_tab_item.swt_tab_item.setData('file', selected_file)
@@ -163,10 +170,12 @@ module Glimmer
     #
     body {
       shell {
+        grid_layout(2, false)
+        
         text "Gladiator - #{::File.expand_path(project_dir.path)}"
         minimum_size 520, 250
         size 1440, 900
-        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]
@@ -216,14 +225,14 @@ module Glimmer
               text '&Split'
               menu_item(:radio) {
                 text '&Horizontal'
-                selection bind(self, :split_orientation, 
-                                      on_read: ->(o) { split_pane? && o == swt(:horizontal)}, 
+                selection bind(self, :split_orientation,
+                                      on_read: ->(o) { split_pane? && o == swt(:horizontal)},
                                       on_write: ->(b) { b ? swt(:horizontal) : swt(:vertical) })
               }
               menu_item(:radio) {
                 text '&Vertical'
-                selection bind(self, :split_orientation, 
-                                      on_read: ->(o) { split_pane? && o == swt(:vertical)}, 
+                selection bind(self, :split_orientation,
+                                      on_read: ->(o) { split_pane? && o == swt(:vertical)},
                                       on_write: ->(b) { b ? swt(:vertical) : swt(:horizontal) })
               }
             }
@@ -253,124 +262,215 @@ module Glimmer
         }
 
         composite {
-          grid_layout 1, false
+          grid_layout(1, false) {
+            margin_width 0
+            margin_height 0
+          }
+          
           layout_data(:fill, :fill, false, true) {
             width_hint 300
           }
-          @filter_text = text {
-            layout_data :fill, :center, true, false
-            text bind(project_dir, 'filter')
-            on_key_pressed { |key_event|
-              if key_event.keyCode == swt(:tab) ||
-                  key_event.keyCode == swt(:cr) ||
-                  key_event.keyCode == swt(:arrow_up) ||
-                  key_event.keyCode == swt(:arrow_down)
-                @list.swt_widget.select(0) if @list.swt_widget.getSelectionIndex() == -1
-                @list.swt_widget.setFocus
-              end
-            }
-          }
-          sash_form(:vertical) {
+          @side_bar_sash_form = sash_form(:vertical) {
             layout_data(:fill, :fill, true, true)
             sash_width 4
-            @list = list(:border, :h_scroll, :v_scroll) {
-              #visible bind(self, 'project_dir.filter') {|f| !!f}
-              selection bind(project_dir, :filtered_path)
-              on_mouse_up {
-                project_dir.selected_child_path = @list.swt_widget.getSelection.first
-              }
-              on_key_pressed { |key_event|
-                if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
-                  project_dir.selected_child_path = @list.swt_widget.getSelection.first
-                  @current_text_editor&.text_widget&.setFocus
-                end
-              }
-              drag_source(DND::DROP_COPY) {
-                transfer [TextTransfer.getInstance].to_java(Transfer)
-                on_drag_set_data { |event|
-                  Gladiator.drag = true
-                  list = event.widget.getControl
-                  event.data = list.getSelection.first
-                }
-              }
+            
+            resize_expand_items = lambda { |event=nil|
+              @file_lookup_expand_item&.swt_expand_item&.height = @file_lookup_expand_bar.size.y - @file_lookup_expand_item.swt_expand_item.header_height
+              @file_explorer_expand_item&.swt_expand_item&.height = @file_explorer_expand_bar.size.y - @file_explorer_expand_item.swt_expand_item.header_height
             }
-            @file_tree = tree(:virtual, :border, :h_scroll, :v_scroll) {
-              #visible bind(self, 'project_dir.filter') {|f| !f}
-              items bind(self, :project_dir), tree_properties(children: :children, text: :name)
-              drag_source(DND::DROP_COPY) {
-                transfer [TextTransfer.getInstance].to_java(Transfer)
-                on_drag_set_data { |event|
-                  Gladiator.drag = true
-                  tree = event.widget.getControl
-                  tree_item = tree.getSelection.first
-                  event.data = tree_item.getData.path
-                }
-              }
-              menu {
-                @open_menu_item = menu_item {
-                  text 'Open'
-                  on_widget_selected {
-                    project_dir.selected_child_path = extract_tree_item_path(@file_tree.swt_widget.getSelection.first)
+            
+            @file_lookup_expand_bar = expand_bar {
+              layout_data :fill, :fill, true, true
+              font height: 17, style: :bold
+              foreground @default_foreground
+              
+              on_swt_show {
+                @file_lookup_expand_item.swt_expand_item.height = @file_lookup_expand_bar.size.y - @file_lookup_expand_item.swt_expand_item.header_height
+              }      
+              
+              on_swt_Resize(&resize_expand_items)                                                                  
+              
+              @file_lookup_expand_item = expand_item {
+                grid_layout {
+                  margin_width 0
+                  margin_height 0
+                }      
+                text 'File Lookup'
+                height display.bounds.height
+                
+                @filter_text = text {
+                  layout_data :fill, :center, true, false
+                  text bind(project_dir, 'filter')
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:tab) ||
+                        key_event.keyCode == swt(:cr) ||
+                        key_event.keyCode == swt(:arrow_up) ||
+                        key_event.keyCode == swt(:arrow_down)
+                      @file_lookup_list.swt_widget.select(0) if @file_lookup_list.swt_widget.getSelectionIndex() == -1
+                      @file_lookup_list.swt_widget.setFocus
+                    end
                   }
                 }
-                menu_item(:separator)
-                menu_item {
-                  text 'Delete'
-                  on_widget_selected {
-                    tree_item = @file_tree.swt_widget.getSelection.first
-                    delete_tree_item(tree_item)
+              
+                @file_lookup_list = list(:border, :h_scroll, :v_scroll) {
+                  layout_data :fill, :fill, true, true
+                  #visible bind(self, 'project_dir.filter') {|f| !!f}
+                  selection bind(project_dir, :filtered_path)
+                  foreground @default_foreground
+                  on_mouse_up {
+                    project_dir.selected_child_path = @file_lookup_list.swt_widget.getSelection.first
                   }
-                }
-                menu_item {
-                  text 'Refresh'
-                  on_widget_selected {
-                    project_dir.refresh
+                  on_key_pressed { |key_event|
+                    if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
+                      project_dir.selected_child_path = @file_lookup_list.swt_widget.getSelection.first
+                      @current_text_editor&.text_widget&.setFocus
+                    end
                   }
-                }
-                menu_item {
-                  text 'Rename'
-                  on_widget_selected {
-                    rename_selected_tree_item
+                  drag_source(DND::DROP_COPY) {
+                    transfer [TextTransfer.getInstance].to_java(Transfer)
+                    on_drag_set_data { |event|
+                      Gladiator.drag = true
+                      list = event.widget.getControl
+                      event.data = list.getSelection.first
+                    }
                   }
                 }
-                menu_item {
-                  text 'New Directory'
-                  on_widget_selected {
-                    add_new_directory_to_selected_tree_item
+              }
+              
+              on_item_collapsed { |event|
+                if @file_explorer_expand_item.swt_expand_item.get_expanded
+                  @file_lookup_expand_item_height = @file_lookup_expand_item.swt_expand_item.height
+                  @file_lookup_expand_item.swt_expand_item.height = 0
+                  @file_lookup_expand_bar_height = @file_lookup_expand_bar.swt_widget.size.y
+                  @file_explorer_expand_bar_height = @file_explorer_expand_bar.swt_widget.size.y
+                  @side_bar_sash_form.weights = [@file_lookup_expand_item.swt_expand_item.header_height, @file_lookup_expand_bar_height + @file_explorer_expand_bar_height - @file_lookup_expand_item.swt_expand_item.header_height]
+                end
+              }              
+            
+              on_item_expanded {
+                @file_lookup_expand_item.swt_expand_item.height = @file_lookup_expand_item_height if @file_lookup_expand_item_height
+                @side_bar_sash_form.weights = [@file_lookup_expand_bar_height, @file_explorer_expand_bar_height]                
+              }              
+              
+            }
+            
+            @file_explorer_expand_bar = expand_bar {
+              layout_data :fill, :fill, true, true
+              font height: 17, style: :bold
+              foreground @default_foreground
+              
+              on_swt_show {
+                @file_explorer_expand_item.swt_expand_item.height = @file_explorer_expand_bar.size.y - @file_explorer_expand_item.swt_expand_item.header_height
+              }          
+              
+              on_swt_Resize(&resize_expand_items)                              
+                          
+              @file_explorer_expand_item = expand_item {
+                grid_layout {
+                  margin_width 0
+                  margin_height 0
+                }      
+                text 'File Explorer'
+                height display.bounds.height
+                
+                @file_tree = tree(:virtual, :border, :h_scroll, :v_scroll) {
+                  layout_data :fill, :fill, true, true
+                  #visible bind(self, 'project_dir.filter') {|f| !f}
+                  items bind(self, :project_dir), tree_properties(children: :children, text: :name)
+                  foreground @default_foreground
+                  drag_source(DND::DROP_COPY) {
+                    transfer [TextTransfer.getInstance].to_java(Transfer)
+                    on_drag_set_data { |event|
+                      Gladiator.drag = true
+                      tree = event.widget.getControl
+                      tree_item = tree.getSelection.first
+                      event.data = tree_item.getData.path
+                    }
                   }
-                }
-                menu_item {
-                  text 'New File'
-                  on_widget_selected {
-                    add_new_file_to_selected_tree_item
+                  menu {
+                    @open_menu_item = menu_item {
+                      text 'Open'
+                      on_widget_selected {
+                        project_dir.selected_child_path = extract_tree_item_path(@file_tree.swt_widget.getSelection.first)
+                      }
+                    }
+                    menu_item(:separator)
+                    menu_item {
+                      text 'Delete'
+                      on_widget_selected {
+                        tree_item = @file_tree.swt_widget.getSelection.first
+                        delete_tree_item(tree_item)
+                      }
+                    }
+                    menu_item {
+                      text 'Refresh'
+                      on_widget_selected {
+                        project_dir.refresh
+                      }
+                    }
+                    menu_item {
+                      text 'Rename'
+                      on_widget_selected {
+                        rename_selected_tree_item
+                      }
+                    }
+                    menu_item {
+                      text 'New Directory'
+                      on_widget_selected {
+                        add_new_directory_to_selected_tree_item
+                      }
+                    }
+                    menu_item {
+                      text 'New File'
+                      on_widget_selected {
+                        add_new_file_to_selected_tree_item
+                      }
+                    }
+                  }
+                  on_swt_menudetect { |event|
+                    path = extract_tree_item_path(@file_tree.swt_widget.getSelection.first)
+                    @open_menu_item.swt_widget.setEnabled(!::Dir.exist?(path)) if path
+                  }
+                  on_mouse_up {
+                    if Gladiator.drag_and_drop
+                      Gladiator.drag_and_drop = false
+                    else
+                      project_dir.selected_child_path = extract_tree_item_path(@file_tree.swt_widget.getSelection&.first)
+                      @current_text_editor&.text_widget&.setFocus
+                    end
+                  }
+                  on_key_pressed { |key_event|
+                    if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
+                      project_dir.selected_child_path = extract_tree_item_path(@file_tree.swt_widget.getSelection&.first)
+                      @current_text_editor&.text_widget&.setFocus
+                    end
+                  }
+                  on_paint_control {
+                    root_item = @file_tree.swt_widget.getItems.first
+                    if root_item && !root_item.getExpanded
+                      root_item.setExpanded(true)
+                    end
                   }
                 }
               }
-              on_swt_menudetect { |event|
-                path = extract_tree_item_path(@file_tree.swt_widget.getSelection.first)
-                @open_menu_item.swt_widget.setEnabled(!::Dir.exist?(path)) if path
-              }
-              on_mouse_up {
-                if Gladiator.drag_and_drop
-                  Gladiator.drag_and_drop = false
-                else
-                  project_dir.selected_child_path = extract_tree_item_path(@file_tree.swt_widget.getSelection&.first)
-                  @current_text_editor&.text_widget&.setFocus
-                end
-              }
-              on_key_pressed { |key_event|
-                if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
-                  project_dir.selected_child_path = extract_tree_item_path(@file_tree.swt_widget.getSelection&.first)
-                  @current_text_editor&.text_widget&.setFocus
+              
+              on_item_collapsed { |event|
+                if @file_lookup_expand_item.swt_expand_item.get_expanded
+                  @file_explorer_expand_item_height = @file_explorer_expand_item.swt_expand_item.height
+                  @file_explorer_expand_item.swt_expand_item.height = 0
+                  @file_explorer_expand_bar_height = @file_explorer_expand_bar.swt_widget.size.y
+                  @file_lookup_expand_bar_height = @file_lookup_expand_bar.swt_widget.size.y
+                  @side_bar_sash_form.weights = [@file_explorer_expand_bar_height + @file_explorer_expand_bar_height - @file_explorer_expand_item.swt_expand_item.header_height, @file_explorer_expand_item.swt_expand_item.header_height]
                 end
-              }
-              on_paint_control {
-                root_item = @file_tree.swt_widget.getItems.first
-                if root_item && !root_item.getExpanded
-                  root_item.setExpanded(true)
-                end
-              }
-            }
+              }              
+            
+              on_item_expanded {
+                @file_explorer_expand_item.swt_expand_item.height = @file_explorer_expand_item_height if @file_explorer_expand_item_height
+                @side_bar_sash_form.weights = [@file_lookup_expand_bar_height, @file_explorer_expand_bar_height]                
+              }                      
+              
+            }            
+
           }
 
           # TODO see if you could replace some of this with Glimmer DSL/API syntax
@@ -380,117 +480,220 @@ module Glimmer
           @file_tree_editor.minimumHeight = 20;
 
         }
-        @editor_container = composite {
-          grid_layout 1, false
+        
+        composite {
+          grid_layout(1, false) {
+            margin_width 0
+            margin_height 0
+          }
           layout_data :fill, :fill, true, true
-          composite {
-            grid_layout 3, false
-
-            # row 1
-
-            label {
-              text 'File:'
-            }
+          
+          @navigation_expand_bar = expand_bar {
+            layout_data :fill, :top, true, false
+            font height: 17, style: :bold
+            foreground @default_foreground
+            
+            @navigation_expand_item = expand_item {
+              text 'Navigation'
+              height 115
 
-            @file_path_label = styled_text(:none) {
-              layout_data(:fill, :fill, true, false) {
-                horizontal_span 2
+              grid_layout(5, false) {
+                margin_right 5
               }
-              background color(:widget_background)
-              editable false
-              caret nil
-              text bind(project_dir, 'selected_child.path')
-              on_mouse_up {
-                @file_path_label.swt_widget.selectAll
+                            
+              stat_font = {name: 'Consolas', height: OS.mac? ? 15 : 12}
+  
+              # row 1
+  
+              label {
+                layout_data(:left, :center, false, false)
+                text 'File:'
+                foreground @default_foreground
               }
-              on_focus_lost {
-                @file_path_label.swt_widget.setSelection(0, 0)
+  
+              @file_path_label = styled_text(:none) {
+                layout_data(:fill, :center, true, false) {
+                  horizontal_span 2
+                }
+                background color(:widget_background)
+                foreground @default_foreground
+                editable false
+                caret nil
+                text bind(project_dir, 'selected_child.path')
+                on_mouse_up {
+                  @file_path_label.swt_widget.selectAll
+                }
+                on_focus_lost {
+                  @file_path_label.swt_widget.setSelection(0, 0)
+                }
               }
-            }
-
-            # row 2
-
-            label {
-              text 'Line:'
-            }
-            @line_number_text = text {
-              layout_data(:fill, :fill, true, false) {
-                minimum_width 400
+                          
+              label {
+                layout_data(:left, :center, false, false)
+                text 'Caret Position:'
+                foreground @default_foreground
               }
-              text bind(project_dir, 'selected_child.line_number', on_read: :to_s, on_write: :to_i)
-              on_key_pressed { |key_event|
-                if key_event.keyCode == swt(:cr)
-                  @current_text_editor&.text_widget&.setFocus
-                end
+              label(:right) {
+                layout_data(:fill, :center, true, false)
+                text bind(project_dir, 'selected_child.caret_position')
+                foreground @default_foreground
+                font stat_font
               }
-              on_verify_text { |event|
-                event.doit = !event.text.match(/^\d*$/).to_a.empty?
+              
+              # row 2
+  
+              label {
+                layout_data(:left, :center, false, false)
+                text 'Line:'
+                foreground @default_foreground
               }
-            }
-            label
-
-            # row 3
-
-            label {
-              text 'Find:'
-            }
-            @find_text = text {
-              layout_data(:fill, :center, true, false) {
-                minimum_width 400
+              @line_number_text = text {
+                layout_data(:fill, :center, true, false) {
+                  minimum_width 400
+                }
+                text bind(project_dir, 'selected_child.line_number', on_read: :to_s, on_write: :to_i)
+                foreground @default_foreground
+                font stat_font
+                on_key_pressed { |key_event|
+                  if key_event.keyCode == swt(:cr)
+                    @current_text_editor&.text_widget&.setFocus
+                  end
+                }
+                on_verify_text { |event|
+                  event.doit = !event.text.match(/^\d*$/).to_a.empty?
+                }
               }
-              text bind(project_dir, 'selected_child.find_text')
-              on_key_pressed { |key_event|
-                if key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:cr)
-                  project_dir.selected_child.case_sensitive = !project_dir.selected_child.case_sensitive
-                  project_dir.selected_child&.find_next
-                end
-                if key_event.keyCode == swt(:cr)
-                  project_dir.selected_child&.find_next
-                end
+              label # filler
+  
+              label {
+                layout_data(:left, :center, false, false)
+                text 'Line Position:'
+                foreground @default_foreground
               }
-            }
-            composite {
-              row_layout
-              button(:check) {
-                selection bind(project_dir, 'selected_child.case_sensitive')
+              label(:right) {
+                layout_data(:fill, :center, true, false)
+                text bind(project_dir, 'selected_child.line_position')
+                foreground @default_foreground
+                font stat_font
+              }
+  
+              # row 3
+  
+              label {
+                layout_data(:left, :center, false, false)
+                text 'Find:'
+                foreground @default_foreground
+              }
+              @find_text = text {
+                layout_data(:fill, :center, true, false) {
+                  minimum_width 400
+                }
+                text bind(project_dir, 'selected_child.find_text')
+                foreground @default_foreground
+                font stat_font
                 on_key_pressed { |key_event|
+                  if key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:cr)
+                    project_dir.selected_child.case_sensitive = !project_dir.selected_child.case_sensitive
+                    project_dir.selected_child&.find_next
+                  end
                   if key_event.keyCode == swt(:cr)
                     project_dir.selected_child&.find_next
                   end
                 }
               }
+              composite {
+                layout_data(:left, :center, true, false)
+                row_layout {
+                  margin_width 0
+                  margin_height 0
+                }
+                button(:check) {
+                  selection bind(project_dir, 'selected_child.case_sensitive')
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      project_dir.selected_child&.find_next
+                    end
+                  }
+                }
+                label {
+                  text 'Case-sensitive'
+                }
+              }
+              
               label {
-                text 'Case-sensitive'
+                layout_data(:left, :center, false, false)
+                text 'Selection Count:'
+                foreground @default_foreground
               }
-            }
-
-            # row 4
-
-            label {
-              text 'Replace:'
-            }
-            @replace_text = text {
-              layout_data(:fill, :fill, true, false) {
-                minimum_width 300
+              label(:right) {
+                layout_data(:fill, :center, true, false)
+                text bind(project_dir, 'selected_child.selection_count')
+                foreground @default_foreground
+                font stat_font
               }
-              text bind(project_dir, 'selected_child.replace_text')
-              on_focus_gained {
-                project_dir.selected_child&.ensure_find_next
+              
+              # row 4
+  
+              label {
+                layout_data(:left, :center, false, false)
+                text 'Replace:'
+                foreground @default_foreground
               }
-              on_key_pressed { |key_event|
-                if key_event.keyCode == swt(:cr)
-                  if project_dir.selected_child
-                    Command.do(project_dir.selected_child, :replace_next!)
+              @replace_text = text {
+                layout_data(:fill, :center, true, false) {
+                  minimum_width 400
+                }
+                text bind(project_dir, 'selected_child.replace_text')
+                foreground @default_foreground
+                font stat_font
+                on_focus_gained {
+                  project_dir.selected_child&.ensure_find_next
+                }
+                on_key_pressed { |key_event|
+                  if key_event.keyCode == swt(:cr)
+                    if project_dir.selected_child
+                      Command.do(project_dir.selected_child, :replace_next!)
+                    end
                   end
-                end
+                }
+              }
+              label # filler
+              label {
+                layout_data(:left, :center, false, false)
+                text 'Top Pixel:'
+                foreground @default_foreground
+              }
+              label(:right) {
+                layout_data(:fill, :center, true, false)
+                text bind(project_dir, 'selected_child.top_pixel')
+                foreground @default_foreground
+                font stat_font
               }
             }
-            label
+            
+            on_item_collapsed {
+              @navigation_expand_item_height = @navigation_expand_item.swt_expand_item.height if @navigation_expand_item.swt_expand_item.height > 0
+              @navigation_expand_item.swt_expand_item.height = 0
+              async_exec {
+                body_root.pack_same_size
+              }
+            }              
+          
+            on_item_expanded {
+              @navigation_expand_item.swt_expand_item.height = @navigation_expand_item_height if @navigation_expand_item_height
+              async_exec {
+                body_root.pack_same_size
+              }
+            }              
+          
           }
+          
           @tab_folder_sash_form = sash_form {
             layout_data(:fill, :fill, true, true) {
-              width_hint 640
-              height_hint 480
+              width_hint 768
+              height_hint 576              
+              minimum_width 768
+              minimum_height 576              
             }
             sash_width 10
             orientation bind(self, :split_orientation)
@@ -539,8 +742,8 @@ module Glimmer
         open_file_paths2 = @config[:open_file_paths2]
         self.split_orientation = swt(@config[:split_orientation] || :horizontal) rescue swt(:horizontal)
         if @progress_bar_shell.nil?
-          @progress_bar_shell = shell(body_root) {
-            text 'Opening Last Open Files'
+          @progress_bar_shell = shell(body_root, :title) {
+            text 'Gladiator'
             fill_layout(:vertical) {
               margin_width 15
               margin_height 15
@@ -674,6 +877,7 @@ module Glimmer
       parent_path = ::File.dirname(file.path)
       if file.is_a?(Gladiator::Dir)
         file_paths = file.all_children.select {|f| f.is_a?(Gladiator::File)}.map(&:path)
+        file.remove_all_observers
       else
         file_paths = [file.path]
       end
@@ -777,8 +981,8 @@ module Glimmer
     
     def open_project
       selected_directory = directory_dialog.open
-      @progress_bar_shell = shell(body_root) {
-        text 'Opening Project'
+      @progress_bar_shell = shell(body_root, :title) {
+        text 'Gladiator'
         fill_layout(:vertical) {
           margin_width 15
           margin_height 15

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

@@ -19,13 +19,19 @@ module Glimmer
       
       body {
         composite {
+          grid_layout(2, false) 
+          # TODO troubleshoot why adding margin height 0 causes gladiator to start resizing window smaller than necessary upon launch of Gladiator
+#           {
+#             margin_height 0
+#           }
+          
           layout_data :fill, :fill, true, true
-          grid_layout 2, false
-          @line_numbers_text = styled_text(:multi, :wrap, :border) {
+          @line_numbers_text = styled_text(:multi, :border) {
             layout_data(:right, :fill, false, true)
+            
             font name: 'Consolas', height: OS.mac? ? 15 : 12
             background color(:widget_background)
-            foreground rgb(0, 0, 250)
+            foreground :dark_blue
             text bind(self, 'file.line_numbers_content')
             top_pixel bind(self, 'file.top_pixel', read_only: true)
             top_margin 5
@@ -33,7 +39,6 @@ module Glimmer
             bottom_margin 5
             left_margin 5
             editable false
-            alignment swt(:right)
             on_focus_gained {
               @text&.swt_widget.setFocus
             }
@@ -51,7 +56,8 @@ module Glimmer
             foreground rgb(75, 75, 75)
             text bind(self, 'file.content')
             focus true
-            selection bind(self, 'file.selection')
+            selection_count bind(self, 'file.selection_count')
+            caret_position bind(self, 'file.caret_position')
             top_pixel bind(self, 'file.top_pixel')
             top_margin 5
             right_margin 5
@@ -144,7 +150,7 @@ module Glimmer
           }
         }
       }
-            
+           
       def extract_char(event)
         event.keyCode.chr
       rescue => e

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.17.10.0
+        version: 4.17.10.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.17.10.0
+        version: 4.17.10.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0