glimmer-cs-gladiator 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9b90cb14c65857fcd2aae74b253de63975e07979598fff9859016fa49eab9c2
-  data.tar.gz: 780b56d9e8e71e1d25d0399eec1c634fa1283af07059f4ec7042a4ff42c7c31d
+  metadata.gz: d31e7dd5189317eaeb3a91a175a050ffaaeb4e82d6c8709167477d26dd7bf237
+  data.tar.gz: 370a540665a9d7f3d08154f1e98530521f72e9a720f35fa83f982747e2e5bf5e
 SHA512:
-  metadata.gz: 381596e40835072897b07ed25faa61f3edd72fba81a4637303b4e2dbb5698a0564f7737b01e7e9ff40f038673d25b5ad20fc8e8875d40a1082df8e1169cf3b09
-  data.tar.gz: d5fd3e26fe95a495eb4ce84eea62ceb3a0080eeae41a15ea45dbfd53275615daa2f90dfa2a0c07de67893387febed5021fb5e46af81be0e5a17afb8aa000453c
+  metadata.gz: 7af2ad9407c442ad6634a843ad3b5fc6cac47dadbd84ec0dc0b19f8d38b858950648a951383be811f040232ab426cbf0dffc1ad1d003a33a6a3cefd07d6c6832
+  data.tar.gz: a9d30dc68de3f7de8fa25c9860c57885892e4ceeea734c63bc4fd2b257736afc0e1b0c7a062d03af93991d03d05907dbfbe058adcf6e13d695ce524167ce5aef

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.3 - [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.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/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)
 
@@ -13,6 +13,9 @@ I leave building truly professional text editors to software tooling experts who
 
 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
@@ -30,10 +33,8 @@ 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)
-- Drag and Drop Text Editor Split Screen (drag a file from File Tree or File Lookup List, and it splits the screen)
-- Run Ruby code (CMD+SHIFT+R)
-- Scratchpad for running arbitrary Ruby/Glimmer code without saving to disk (CMD+SHIFT+S)
-- Change Split Orientation to Horizontal/Vertical via View Menu (CMD+SHIFT+O)
+- 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)
 
 ## Platforms
 
@@ -77,6 +78,12 @@ You may run the `gladiator` command to bring up the text editor in the project d
 gladiator
 ```
 
+On Linux, you may need to run with extra memory via this command instead:
+
+```
+gladiator -J-Xmx1200M
+```
+
 On Windows, you may need to run with extra memory via this command instead:
 
 ```
@@ -103,7 +110,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.3'
+gem 'glimmer-cs-gladiator', '~> 0.5.4'
 ```
 
 Run:
@@ -132,13 +139,9 @@ Opens Gladiator with "/Users/User/code" as the root directory.
 Gladiator automatically saves configuration data in a `.gladiator` file at the directory it is run from.
 
 It currently remembers:
-- Last opened file
-- Caret position
-- Top line position
-- Window size
-- Opened tabs
-- Split tabs
-- Ignore Paths
+- Last opened files (in both split panes if split)
+- Window size and position
+- Ignore Paths (default: '.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor')
 
 ## Gotcha
 

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

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

@@ -6,8 +6,6 @@ module Glimmer
       include Glimmer
       include Glimmer::DataBinding::ObservableModel
 
-      REFRESH_DELAY = 7
-  
       attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :display_path, :ignore_paths
       attr_reader :name, :parent, :path
       attr_writer :all_children
@@ -15,19 +13,30 @@ module Glimmer
       def initialize(path, project_dir = nil)
         @project_dir = project_dir
         if is_local_dir
-         @filewatcher = Filewatcher.new(path)
-         @thread = Thread.new(@filewatcher) do |fw|
-           fw.watch do |filename, event|
-             if @last_update.nil? || (Time.now.to_f - @last_update) > REFRESH_DELAY
-               refresh if !filename.include?('new_file') && !selected_child_path_history.include?(filename) && filename != selected_child_path
-             end
-             @last_update = Time.now.to_f
-           end
-         end
+          @filewatcher = Filewatcher.new(path)
+          Thread.new(@filewatcher) do |fw|
+            begin
+              fw.watch do |filename, event|
+                # TODO do fine grained processing of events for enhanced performance (e.g. dir refresh vs file change)
+                # TODO do fine grained file change only without a refresh delay for enhanced performance
+                begin
+                  if !@refresh_in_progress && !filename.include?('new_file') && (event != :updated || find_child_file(filename).nil?)
+                    Thread.new {
+                      refresh
+                    }
+                  end
+                rescue => e
+                  puts e.full_message
+                end
+              end
+            rescue => e
+              puts e.full_message
+            end
+          end
         end
         self.path = ::File.expand_path(path)
         @name = ::File.basename(::File.expand_path(path))
-        @ignore_paths = ['.gladiator', '.git', 'coverage', 'packages', 'tmp', 'vendor']
+        @ignore_paths = ['.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor']
         self.filtered_path_options = []
       end
       
@@ -67,7 +76,7 @@ module Glimmer
             result || p.include?(ignore_path)
           end
         end.map do |p|
-          ::File.file?(p) ? Gladiator::File.new(p, project_dir) : Gladiator::Dir.new(p, project_dir)
+          ::File.file?(p) ? File.new(p, project_dir) : Dir.new(p, project_dir)
         end.sort_by do |c|
           c.path.to_s.downcase
         end.sort_by do |c|
@@ -76,6 +85,22 @@ module Glimmer
           child.retrieve_children if child.is_a?(Dir)
         end
       end
+      
+      def find_child_file(child_path)
+        depth_first_search_file(self, child_path)
+      end
+      
+      def depth_first_search_file(dir, file_path)
+        dir.children.each do |child|
+          if child.is_a?(File)
+            return child if child.path.include?(file_path)
+          else
+            result = depth_first_search_file(child, file_path)
+            return result unless result.nil?
+          end
+        end
+        nil
+      end
   
       def selected_child_path_history
         @selected_child_path_history ||= []
@@ -91,6 +116,7 @@ module Glimmer
 
       def refresh(async: true, force: false)
         return if @refresh_paused && !force
+        @refresh_in_progress = true
         retrieve_children
         collect_all_children
         refresh_operation = lambda do
@@ -102,6 +128,7 @@ module Glimmer
         else
           sync_exec(&refresh_operation)
         end
+        @refresh_in_progress = false
       end
   
       def filter=(value)
@@ -144,7 +171,7 @@ module Glimmer
       def selected_child_path=(selected_path)
         return (project_dir.selected_child = nil) if selected_path.nil?
         # scratchpad scenario
-        if selected_path.empty? #scratchpad
+        if selected_path.empty? # Scratchpad
           @selected_child&.write_dirty_content
           return (self.selected_child = File.new)
         end
@@ -154,7 +181,7 @@ module Glimmer
         selected_path = full_selected_path
         if ::File.file?(selected_path)
           @selected_child&.write_dirty_content
-          new_child = Gladiator::File.new(selected_path, project_dir)
+          new_child = find_child_file(selected_path)
           begin
             unless new_child.dirty_content.nil?
               self.selected_child&.stop_filewatcher
@@ -175,6 +202,7 @@ module Glimmer
       end
       
       def selected_child=(new_child)
+        return if selected_child == new_child
         file_properties = @selected_child&.backup_properties if @selected_child == new_child
         @selected_child = new_child
         @selected_child.restore_properties(file_properties) if file_properties

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

@@ -3,7 +3,7 @@ module Glimmer
     class File
       include Glimmer
 
-      attr_accessor :dirty_content, :line_numbers_content, :selection, :line_number, :find_text, :replace_text, :top_pixel, :display_path, :case_sensitive
+      attr_accessor :line_numbers_content, :selection, :line_number, :find_text, :replace_text, :top_pixel, :display_path, :case_sensitive
       attr_reader :name, :path, :project_dir
 
       def initialize(path='', project_dir=nil)
@@ -15,31 +15,45 @@ module Glimmer
         @top_pixel = 0
         @selection_count = 0
         @selection = Point.new(0, 0 + @selection_count)
-        read_dirty_content = path.empty? ? '' : ::File.read(path)
-        begin
-          # test read dirty content
-          read_dirty_content.split("\n")
-          observe(self, :dirty_content) do
-            lines_text_size = lines.size.to_s.size
-            self.line_numbers_content = lines.size.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n")
-          end
-          @line_number = 1
-          self.dirty_content = read_dirty_content
-          observe(self, :selection) do
-            self.line_number = line_index_for_caret_position(caret_position) + 1
-          end
-          observe(self, :line_number) do
-            if line_number
-              line_index = line_number - 1
-              new_caret_position = caret_position_for_line_index(line_index)
-              self.caret_position = new_caret_position unless self.caret_position && line_index_for_caret_position(new_caret_position) == line_index_for_caret_position(caret_position)
+        @line_number = 1
+      end
+      
+      def init_content
+        unless @init
+          @init = true
+          begin
+            # test read dirty content
+            observe(self, :dirty_content) do
+              lines_text_size = lines.size.to_s.size
+              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.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
+              new_line_number = line_index_for_caret_position(caret_position) + 1
+              async_exec {
+                self.line_number = new_line_number
+              }
+            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
             end
+          rescue # in case of a binary file
+            stop_filewatcher
           end
-        rescue
-          # no op in case of a binary file
         end
       end
-
+      
       def path=(the_path)
         @path = the_path
         generate_display_path
@@ -71,6 +85,7 @@ module Glimmer
       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
@@ -107,9 +122,26 @@ module Glimmer
         end
       end
       
+      def dirty_content
+        init_content
+        @dirty_content
+      end
+      
       def dirty_content=(the_content)
+        # TODO set partial dirty content by line(s) for enhanced performance
         @dirty_content = the_content
+        old_caret_position = caret_position
+        old_top_pixel = top_pixel
         notify_observers(:content)
+        if @formatting_dirty_content_for_writing
+          self.caret_position = old_caret_position
+          self.selection_count = 0
+          self.top_pixel = old_top_pixel
+        end
+      end
+      
+      def read_dirty_content
+        path.empty? ? '' : ::File.read(path)
       end
 
       def start_filewatcher
@@ -117,15 +149,13 @@ module Glimmer
         @filewatcher = Filewatcher.new(@path)
         @thread = Thread.new(@filewatcher) do |fw|
           fw.watch do |filename, event|
-            begin
-              read_dirty_content = ::File.read(path)
-              # test read dirty content
-              read_dirty_content.split("\n")
-              async_exec do
+            async_exec do
+              begin
                 self.dirty_content = read_dirty_content if read_dirty_content != dirty_content
+              rescue StandardError, Errno::ENOENT
+                # in case of a binary file
+                stop_filewatcher
               end
-            rescue
-              # no op in case of a binary file
             end
           end
         end
@@ -135,21 +165,26 @@ module Glimmer
         @filewatcher&.stop
       end
 
-      def format_dirty_content_for_writing!
-        new_dirty_content = dirty_content.split("\n").map {|line| line.strip.empty? ? line : line.rstrip }.join("\n")
-        new_dirty_content = "#{new_dirty_content.gsub("\r\n", "\n").gsub("\r", "\n").sub(/\n+\z/, '')}\n"
-        self.dirty_content = new_dirty_content if new_dirty_content != self.dirty_content
-      end
-
       def write_dirty_content
-        return if scratchpad? || !::File.exist?(path)
+        # TODO write partial dirty content by line(s) for enhanced performance
+        return if scratchpad? || !::File.exist?(path) || !::File.exists?(path) || read_dirty_content == dirty_content
         format_dirty_content_for_writing!
-        ::File.write(path, dirty_content) if ::File.exists?(path)
-      rescue => e
+        ::File.write(path, dirty_content)
+      rescue StandardError, ArgumentError => e
         puts "Error in writing dirty content for #{path}"
         puts e.full_message
       end
 
+      def format_dirty_content_for_writing!
+        new_dirty_content = dirty_content.split("\n").map {|line| line.strip.empty? ? line : line.rstrip }.join("\n")
+        new_dirty_content = "#{new_dirty_content.gsub("\r\n", "\n").gsub("\r", "\n").sub(/\n+\z/, '')}\n"
+        if new_dirty_content != self.dirty_content
+          @formatting_dirty_content_for_writing = true
+          self.dirty_content = new_dirty_content
+          @formatting_dirty_content_for_writing = false
+        end
+      end
+
       def write_raw_dirty_content
         return if scratchpad? || !::File.exist?(path)
         ::File.write(path, dirty_content) if ::File.exists?(path)
@@ -185,7 +220,7 @@ module Glimmer
         self.caret_position = caret_position_for_line_index(line_number) + current_line_indentation.size
         self.selection_count = 0
       end
-
+      
       def comment_line!
         old_lines = lines
         return if old_lines.size < 1
@@ -219,6 +254,7 @@ module Glimmer
           new_caret_position = old_caret_position + delta
           new_caret_position = [new_caret_position, old_caret_position_line_caret_position].max
           self.caret_position = new_caret_position
+          self.selection_count = 0
         end
       end
 
@@ -243,6 +279,7 @@ module Glimmer
           self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
         else
           self.caret_position = old_caret_position + delta
+          self.selection_count = 0
         end
       end
 
@@ -274,6 +311,7 @@ module Glimmer
           new_caret_position = old_caret_position + delta
           new_caret_position = [new_caret_position, old_caret_position_line_caret_position].max
           self.caret_position = new_caret_position
+          self.selection_count = 0
         end
       end
 
@@ -311,6 +349,7 @@ module Glimmer
           self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
         else
           self.caret_position = old_caret_position + delta
+          self.selection_count = 0
         end
       end
 

data/lib/views/glimmer/gladiator.rb

@@ -35,8 +35,26 @@ module Glimmer
       @project_dir ||= Dir.new(project_dir_path)
     end
 
-    attr_reader :find_text, :tab_folder1, :tab_folder2, :filter_text, :rename_in_progress, :line_number_text, :file_tree
-    attr_accessor :split_orientation, :current_tab_item, :current_tab_folder, :current_text_editor
+    def split_orientation=(value)
+      @split_orientation = value
+      save_config
+      if @loaded_config && !split_pane?
+        Gladiator.drag = true
+        child_path = project_dir.selected_child_path
+        project_dir.selected_child = nil
+        project_dir.selected_child_path = child_path
+        Gladiator.drag = false
+      end
+      @split_orientation
+    end
+    
+    def split_pane?
+      pane_count = @tab_folder_sash_form&.children&.size
+      pane_count && pane_count > 1
+    end
+
+    attr_reader :find_text, :tab_folder1, :tab_folder2, :filter_text, :rename_in_progress, :line_number_text, :file_tree, :split_orientation
+    attr_accessor :current_tab_item, :current_tab_folder, :current_text_editor
 
     ## Uncomment before_body block to pre-initialize variables to use in body
     #
@@ -180,7 +198,7 @@ module Glimmer
                 begin
                   project_dir.selected_child_path = ''
                 rescue => e
-                  pd e
+                  puts e.full_message
                 end
               }
             }
@@ -198,11 +216,15 @@ module Glimmer
               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)})
+                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) { o == swt(:vertical)}, on_write: ->(b) { b ? swt(:vertical) : swt(:horizontal)})
+                selection bind(self, :split_orientation, 
+                                      on_read: ->(o) { split_pane? && o == swt(:vertical)}, 
+                                      on_write: ->(b) { b ? swt(:vertical) : swt(:horizontal) })
               }
             }
           }
@@ -248,11 +270,9 @@ module Glimmer
               end
             }
           }
-          composite {
-            fill_layout(:vertical) {
-              spacing 5
-            }
+          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)
@@ -517,20 +537,59 @@ module Glimmer
         project_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|
-          project_dir.selected_child_path = file_path
+        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'
+            fill_layout(:vertical) {
+              margin_width 15
+              margin_height 15
+              spacing 5
+            }
+            label(:center) {
+              text "Opening Last Open Files"
+              font height: 20
+            }
+    #         @progress_bar = progress_bar(:horizontal, :indeterminate)
+          }
+          async_exec {
+            @progress_bar_shell.open
+          }
         end
-        # TODO replace the next line with one that selects the visible tab
-        project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path] && open_file_paths1.to_a.include?(@config[:selected_child_path])
-        Gladiator.drag = true
-        open_file_paths2.to_a.each do |file_path|
-          project_dir.selected_child_path = file_path
+        open_file_paths1.to_a.each do |file_path|
+          async_exec {
+            Gladiator.drag = false
+            project_dir.selected_child_path = file_path
+          }
         end
         # TODO replace the next line with one that selects the visible tab
-        project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path] && open_file_paths2.to_a.include?(@config[:selected_child_path])
-        Gladiator.drag = false
-        project_dir.selected_child&.caret_position  = project_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
-        project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
+        async_exec {
+          Gladiator.drag = false
+          project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path] && open_file_paths1.to_a.include?(@config[:selected_child_path])
+          project_dir.selected_child&.caret_position  = project_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
+          project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
+        }
+        async_exec {
+          open_file_paths2.to_a.each do |file_path|
+            async_exec {
+              Gladiator.drag = true
+              project_dir.selected_child_path = file_path
+            }
+          end
+          # TODO replace the next line with one that selects the visible tab
+          async_exec {
+            Gladiator.drag = true
+            project_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path] && open_file_paths2.to_a.include?(@config[:selected_child_path])
+            project_dir.selected_child&.caret_position  = project_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
+            project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
+          }
+          async_exec {
+            Gladiator.drag = false
+            @progress_bar_shell.close
+            @progress_bar_shell = nil
+            @loaded_config = true
+          }
+        }
       else
         @loaded_config = true
       end
@@ -546,6 +605,7 @@ module Glimmer
       open_file_paths2 = tab_folder2&.swt_widget&.items.to_a.map {|i| i.get_data('file_path')}
       @config = {
         selected_child_path: child.path,
+        split_orientation: split_orientation == swt(:horizontal) ? 'horizontal' : 'vertical',
         caret_position: child.caret_position,
         top_pixel: child.top_pixel,
         shell_width: swt_widget&.getBounds&.width,
@@ -612,17 +672,23 @@ module Glimmer
       return if tree_item.nil?
       file = tree_item.getData
       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)
+      else
+        file_paths = [file.path]
+      end
+      file_paths.each do |file_path|
+        found_tab_item = find_tab_item(file_path)
+        if found_tab_item
+          project_dir.selected_child_path_history.delete(found_tab_item.getData('file_path'))
+          found_tab_item.getData('proxy')&.dispose
+        end
+      end
       file.delete! # TODO consider supporting command undo/redo
       project_dir.refresh(async: false)
       parent_tree_item = @file_tree.depth_first_search {|ti| ti.getData.path == parent_path}.first
       @file_tree.swt_widget.showItem(parent_tree_item)
       parent_tree_item.setExpanded(true)
-      # TODO close text editor tab
-      found_tab_item = find_tab_item(file.path)
-      if found_tab_item
-        project_dir.selected_child_path_history.delete(found_tab_item.getData('file_path'))
-        found_tab_item.getData('proxy')&.dispose
-      end
     rescue => e
       puts e.full_message
     end
@@ -691,6 +757,9 @@ module Glimmer
             else
               selected_tab_item&.getData('text_editor')&.text_widget&.setFocus
             end
+            async_exec {
+              @file_tree.swt_widget.showItem(edited_tree_item)
+            }
           end
           project_dir.resume_refresh
         },
@@ -721,19 +790,16 @@ module Glimmer
         }
 #         @progress_bar = progress_bar(:horizontal, :indeterminate)
       }
-      Thread.new {
-        async_exec {
-          @progress_bar_shell.open
-        }
+      async_exec {
+        @progress_bar_shell.open
       }
-      Thread.new {
-        async_exec {
-          gladiator(project_dir_path: selected_directory) {
-            on_swt_show {
-              @progress_bar_shell.close
-            }
-          }.open if selected_directory
-        }
+      async_exec {
+        gladiator(project_dir_path: selected_directory) {
+          on_swt_show {
+            @progress_bar_shell.close
+            @progress_bar_shell = nil
+          }
+        }.open if selected_directory
       }
     end
     
@@ -780,7 +846,7 @@ module Glimmer
           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)
+        self.split_orientation = split_pane? && split_orientation == swt(:horizontal) ? swt(:vertical) : swt(:horizontal)
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == ']'
         current_tab_folder.swt_widget.setSelection((current_tab_folder.swt_widget.getSelectionIndex() + 1) % current_tab_folder.swt_widget.getItemCount) if current_tab_folder.swt_widget.getItemCount > 0
         current_text_editor&.text_widget&.setFocus
@@ -855,4 +921,4 @@ module Glimmer
       end
     end
   end
-end
+end

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

@@ -21,7 +21,7 @@ module Glimmer
         composite {
           layout_data :fill, :fill, true, true
           grid_layout 2, false
-          @line_numbers_text = styled_text(:multi, :border) {
+          @line_numbers_text = styled_text(:multi, :wrap, :border) {
             layout_data(:right, :fill, false, true)
             font name: 'Consolas', height: OS.mac? ? 15 : 12
             background color(:widget_background)
@@ -33,6 +33,7 @@ module Glimmer
             bottom_margin 5
             left_margin 5
             editable false
+            alignment swt(:right)
             on_focus_gained {
               @text&.swt_widget.setFocus
             }
@@ -52,6 +53,10 @@ module Glimmer
             focus true
             selection bind(self, 'file.selection')
             top_pixel bind(self, 'file.top_pixel')
+            top_margin 5
+            right_margin 5
+            bottom_margin 5
+            left_margin 5
             drop_target(DND::DROP_COPY) {
               transfer [TextTransfer.getInstance].to_java(Transfer)
               on_drag_enter { |event|
@@ -132,12 +137,8 @@ module Glimmer
                   verify_event.text += file.current_line_indentation
                 end
               when "\t"
-                if file.selection_count.to_i > 0
-                  Command.do(file, :indent!)
-                  verify_event.doit = false
-                else
-                  verify_event.text = '  '
-                end
+                Command.do(file, :indent!)
+                verify_event.doit = false
               end
             }
           }

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.17.8.3
+        version: 4.17.10.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.17.8.3
+        version: 4.17.10.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0
@@ -49,7 +49,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.5
   name: clipboard
   prerelease: false
   type: :runtime
@@ -57,7 +57,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: