glimmer-cs-gladiator 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05d78a9ecf5d67e3aa15255e0c34c0772c07b875a6f6ffc08c30b06961bbda47
-  data.tar.gz: 51c0ae819c0623ffced64109236b1ce0f3197745e7c49f084ba5ab63e2784cc7
+  metadata.gz: a2bd61ab016bc1d3992e56c082f137a5ed81941806fd20249c3a94020cb9970c
+  data.tar.gz: 293d2e2c7928fd5098e9f831b92cda26fc293bba8fdc5d8f11f06ef965877660
 SHA512:
-  metadata.gz: 02fca47a4008e799265183f2c51e49bab365fc9d42e7a51ea85c70001f26c15ca41c62692b4b90b1f99482c678dc5cf90e883ef561c6e783d9d4b25c6602e3f4
-  data.tar.gz: 7da035e31ca27bcaac5ad9fc71638d9e32e502f3cc7ef73e8948becbd5de4f0036d78cd4bde553be264d171a6703cbcaa27b3baba3770c186442c7325cbe6c6e
+  metadata.gz: 468c13aaba846681e204d56e730b3a4c673fbee65f85423817f3580560bfb6c0361655504dfcffbcfe1c44aab184b1db637aa2e07713bf6f77a1f288579e8672
+  data.tar.gz: 99929299b521b244b8d4912a4fec64f7b6e0bd630b3e4e49a257ad7247391187dcb5a0dcb85ff06726170fb706d1998b8f496fe38f40996c93316cf444798186

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 0.9.2
+
+- Ensure cleaning filewatcher/thread resources when closing a project dir/file
+- Fix issue with `gladiator` function command produced by `gladiator-setup` not forwarding arguments in
+- Fix issue with making changes to file through Find/Replace not persisting if I close Gladiator right afterwards unless I focus/unfocus open text editor
+- Fix issue with not being able to open a project by passing project directory as first argument to `gladiator` command
+- Fix issue with sometimes not remembering last open tabs when opening Gladiator
+- Fix issues with renaming files in file explorer not reflecting change in open tab file name
+- Fix minor issue with leaving `'-J-Xrs'` option in `bin/gladiator`
+- Fix issue with Scratchpad not running content anymore
+- Fix issue of stopping file watcher for open files that still need watching
+
 ## 0.9.1
 
 - Upgrade to glimmer-dsl-swt 4.20.15.4

data/README.md

@@ -1,19 +1,19 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.9.1 - [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.9.2 - [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 DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) sample beta 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).
+[Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) (short for Glimmer Editor) is a [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) sample beta 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 of 2020.
+[Gladiator](https://rubygems.org/gems/glimmer-cs-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](https://rubygems.org/gems/glimmer-cs-gladiator) to develop all my [open-source projects](https://github.com/AndyObtiva) since May of 2020.
 
-You may now [download](#download) a packaged version of Gladiator.
+You may now [download](#download) a packaged version of [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator).
 
 ## Features
 
-Gladiator currently supports the following text editing features (including keyboard shortcuts with Mac CMD=CTRL/CTRL=ALT on Windows/Linux)
+[Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) currently supports the following text editing features (including keyboard shortcuts with Mac CMD=CTRL/CTRL=ALT on Windows/Linux)
 
 ![Gladiator Demo](images/glimmer-gladiator.gif)
 
@@ -105,9 +105,9 @@ Gladiator currently supports the following text editing features (including keyb
 
 ## Platforms
 
-- 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 a few annoying issues.
-- Linux: Gladiator works with handicaps on Linux (performing some text editing operations causes scroll jitter). Contributers could help fix.
+- Mac: [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) works best on the Mac. This is the platform it is most used on and receives the most maintenance for.
+- Windows: [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) works OK on Windows, but has a few annoying issues.
+- Linux: [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) works with handicaps on Linux (performing some text editing operations causes scroll jitter). Contributers could help fix.
 
 ## Pre-requisites
 
@@ -117,11 +117,13 @@ Gladiator currently supports the following text editing features (including keyb
 
 ## Download
 
-[Download Gladiator 0.9.1 Mac DMG Installer](https://www.dropbox.com/s/s9yp6qtelh85qko/Gladiator-0.9.1.dmg?dl=1)
+[Download Gladiator 0.9.2 Mac DMG Installer (x64 Catalina & Older)](https://www.dropbox.com/s/8gvthczqhb9szwp/Gladiator-0.9.2.dmg?dl=1)
 
-[Download Gladiator 0.8.3 Windows MSI Installer](https://www.dropbox.com/s/7kcrf7r5p6vxfm7/Gladiator-0.8.3.msi?dl=1)
+[Download Gladiator 0.9.2 Windows MSI Installer (x64 Windows 10)](https://www.dropbox.com/s/xxik700jh0utn8q/Gladiator-0.9.2.msi?dl=1)
 
-The packaged version starts with a dialog asking you what project to open. Gladiator does not fully show up until you have selected a project directory.
+[Download Gladiator 0.9.1 Mac DMG Installer (x64 Big Sur & Older)](https://www.dropbox.com/s/s9yp6qtelh85qko/Gladiator-0.9.1.dmg?dl=1)
+
+The packaged version starts with a dialog asking you what project to open. [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) does not fully show up until you have selected a project directory.
 
 Otherwise, if you prefer a command line version, then follow the Setup Instructions below.
 
@@ -129,7 +131,7 @@ Otherwise, if you prefer a command line version, then follow the Setup Instructi
 
 Note: if you encounter any issues, check if they are documented in [TODO.md](TODO.md), [issues](https://github.com/AndyObtiva/glimmer-cs-gladiator/issues), or [pull requests](https://github.com/AndyObtiva/glimmer-cs-gladiator/pulls) as they might be on my radar to fix. Otherwise, please report as an [issue](https://github.com/AndyObtiva/glimmer-cs-gladiator/issues) or better yet fix and submit a [pull request](https://github.com/AndyObtiva/glimmer-cs-gladiator/pulls). Also, try going back to a [previous version of the gem](https://rubygems.org/gems/glimmer-cs-gladiator/versions) until you find one that works. Keep in mind this is open-source software provided as is, so there are no guarantees of functionality. If you would like such guarantees, you are welcome to [hire me full-time](https://www.linkedin.com/in/andymaleh/).
 
-Install Gladiator gem by running (`jgem`, `jruby -S gem`, or `gem` directly if you have [RVM](https://rvm.io/)):
+Install [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) gem by running (`jgem`, `jruby -S gem`, or `gem` directly if you have [RVM](https://rvm.io/)):
 
 ```
 jgem install glimmer-cs-gladiator
@@ -139,7 +141,7 @@ Or add to a JRuby project Bundler `Gemfile` under the `:developement` group:
 
 ```
 group :development do
-  gem 'glimmer-cs-gladiator'
+  gem 'glimmer-cs-gladiator', '> 0'
 end
 ```
 
@@ -158,6 +160,10 @@ source ~/.gladiator_source
 
 You should be able to run `gladiator` from anywhere now.
 
+You can pass a project path as a first argument to open a particular project.
+
+Alternatively, open in app mode (gives you a dialog to open any project) by passing `APP_MODE=true` argument/env-var.
+
 ## Usage
 
 You may run the `gladiator` command to bring up the text editor in the project directory you would like to edit:
@@ -188,11 +194,11 @@ Note: If you cloned this project and bundle installed, you may invoke via `bin/g
 
 ### Glimmer Custom Shell Reuse
 
-To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application, add the
+To reuse [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) as a Glimmer Custom Shell inside another Glimmer application, add the
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '>= 0.9.1'
+gem 'glimmer-cs-gladiator', '>= 0.9.2'
 ```
 
 Run:
@@ -201,11 +207,17 @@ Run:
 jruby -S bundle
 ```
 
-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.
+And, then instantiate the [Gladiator](https://rubygems.org/gems/glimmer-cs-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
 
-Gladiator opens with the current directory as the root by default.
+[Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) supports these environment variable options.
+
+### LOCAL_DIR
+
+(String / default: `'.'`)
+
+[Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) opens with the current directory as the root by default.
 If you would like to open another directory, set `LOCAL_DIR` environment variable.
 
 Example:
@@ -214,11 +226,23 @@ Example:
 LOCAL_DIR="/Users/User/code" gladiator
 ```
 
-Opens Gladiator with "/Users/User/code" as the root directory.
+Opens [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) with "/Users/User/code" as the root directory.
+
+### APP_MODE
+
+(`true` or `false` / default: `false` from terminal/command-line and `true` from [packaged Gladiator](#download))
+
+Specifies whether to run in app mode, thus providing a dialog to open any project path instead of starting with a specific project from the get-go.
+
+Example:
+
+```
+APP_MODE=true gladiator
+```
 
 ## Configuration
 
-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.
+[Gladiator](https://rubygems.org/gems/glimmer-cs-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)
@@ -229,7 +253,7 @@ It currently remembers:
 
 ### Signaling Error
 
-Gladiator repetitively displays a signaling error that is harmless in practice:
+[Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) repetitively displays a signaling error that is harmless in practice:
 ```
 The signal HUP is in use by the JVM and will not work correctly on this platform
 The signal INT is in use by the JVM and will not work correctly on this platform
@@ -239,7 +263,7 @@ The signal TERM is in use by the JVM and will not work correctly on this platfor
 ### App Is Not Responding
 
 If you run the `gladiator` command from the root directory or some parent directory to many projects, it assumes that is
-the project directory and attempts to pre-load all files (just part of Gladiator's architectural design and assumptions for optimizing use per project), taking a very long time and not responding for quite a while.
+the project directory and attempts to pre-load all files (just part of [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator)'s architectural design and assumptions for optimizing use per project), taking a very long time and not responding for quite a while.
 
 To avoid this problem, always make sure you are running the `gladiator` command from a single project's directory.
 

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/bin/gladiator

@@ -24,11 +24,8 @@
 require 'glimmer/launcher'
 
 gladiator_runner = File.expand_path('../glimmer-cs-gladiator', __FILE__)
-launcher = Glimmer::Launcher.new([gladiator_runner, '-J-Xrs'] + ARGV)
-launcher.application_paths.to_a.each do |file|
-  if file != gladiator_runner
-    launcher.application_paths.delete(file)
-    ENV['LOCAL_DIR'] ||= file
-  end
-end
+launcher = Glimmer::Launcher.new([gladiator_runner] + ARGV)
+local_dir = ARGV.find {|arg| !arg.include?('=') }
+local_dir = File.expand_path(local_dir) if local_dir
+ENV['LOCAL_DIR'] ||= local_dir if local_dir != gladiator_runner
 launcher.launch

data/bin/gladiator-setup

@@ -40,7 +40,7 @@ end
 gladiator_script = <<~SHELL_SCRIPT
   function gladiator()
   {
-    #{command}
+    #{command} $@
   }
 SHELL_SCRIPT
 

data/glimmer-cs-gladiator.gemspec

@@ -1,21 +1,22 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-cs-gladiator 0.9.1 ruby lib
+# stub: glimmer-cs-gladiator 0.9.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-cs-gladiator".freeze
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andy Maleh".freeze]
-  s.date = "2021-09-14"
+  s.date = "2021-12-10"
   s.description = "Gladiator (short for Glimmer Editor) is a Glimmer sample project under on-going development. It is not intended to be a full-fledged editor by any means, yet mostly a fun educational exercise in using Glimmer to build a text editor. Gladiator is also a personal tool for shaping an editor exactly the way I like. I leave building truly professional text editors to software tooling experts who would hopefully use Glimmer one day.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer-cs-gladiator".freeze, "gladiator".freeze, "gladiator-setup".freeze]
   s.extra_rdoc_files = [
+    "CHANGELOG.md",
     "LICENSE.txt",
     "README.md"
   ]
@@ -53,20 +54,22 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, ["~> 4.20.15.4"])
+    s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, ["~> 4.20.16.0"])
     s.add_runtime_dependency(%q<filewatcher>.freeze, ["~> 1.1.1"])
     s.add_runtime_dependency(%q<clipboard>.freeze, ["~> 1.3.5"])
     s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
     s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
     s.add_development_dependency(%q<warbler>.freeze, ["= 2.0.5"])
+    s.add_development_dependency(%q<jruby-jars>.freeze, ["= 9.2.19.0"])
     s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<glimmer-dsl-swt>.freeze, ["~> 4.20.15.4"])
+    s.add_dependency(%q<glimmer-dsl-swt>.freeze, ["~> 4.20.16.0"])
     s.add_dependency(%q<filewatcher>.freeze, ["~> 1.1.1"])
     s.add_dependency(%q<clipboard>.freeze, ["~> 1.3.5"])
     s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
     s.add_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
     s.add_dependency(%q<warbler>.freeze, ["= 2.0.5"])
+    s.add_dependency(%q<jruby-jars>.freeze, ["= 9.2.19.0"])
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
   end
 end

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

@@ -16,7 +16,7 @@ module Glimmer
         @project_dir = project_dir
         if is_local_dir
           @filewatcher = Filewatcher.new(path)
-          Thread.new(@filewatcher) do |fw|
+          @filewatcher_thread = 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)
@@ -109,6 +109,19 @@ module Glimmer
       def selected_child_path_history
         @selected_child_path_history ||= []
       end
+      
+      def close
+        all_children_files.each(&:close)
+        stop_filewatcher
+      end
+      
+      def stop_filewatcher
+        @filewatcher&.stop
+        @filewatcher_thread&.kill
+        @filewatcher_thread = nil
+        @filewatcher&.finalize
+        @filewatcher = nil
+      end
   
       def pause_refresh
         @refresh_paused = true
@@ -177,7 +190,7 @@ module Glimmer
         # scratchpad scenario
         if selected_path.empty? # Scratchpad
           @selected_child&.write_dirty_content
-          @scratchpad = (self.selected_child = File.new('', project_dir.path)) if @scratchpad.nil? || @scratchpad.closed?
+          @scratchpad = (self.selected_child = File.new('', project_dir)) if @scratchpad.nil? || @scratchpad.closed?
           return @scratchpad
         end
         full_selected_path = selected_path.include?(project_dir.path) ? selected_path : ::File.join(project_dir.path, selected_path)
@@ -189,7 +202,6 @@ module Glimmer
           new_child = find_child_file(selected_path)
           begin
             unless new_child.dirty_content.nil?
-              self.selected_child&.stop_filewatcher
               selected_child_path_history << new_child.path if new_child && !selected_child_path_history.include?(new_child.path)
               self.selected_child = new_child
               self.selected_child.start_filewatcher

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

@@ -244,8 +244,8 @@ module Glimmer
 
       def start_filewatcher
         return if scratchpad?
-        @filewatcher = Filewatcher.new(@path)
-        @thread = Thread.new(@filewatcher) do |fw|
+        @filewatcher ||= Filewatcher.new(@path)
+        @filewatcher_thread ||= Thread.new(@filewatcher) do |fw|
           fw.watch do |filename, event|
             async_exec do
               begin
@@ -261,6 +261,10 @@ module Glimmer
 
       def stop_filewatcher
         @filewatcher&.stop
+        @filewatcher_thread&.kill
+        @filewatcher_thread = nil
+        @filewatcher&.finalize
+        @filewatcher = nil
       end
 
       def write_dirty_content
@@ -519,6 +523,7 @@ module Glimmer
         self.dirty_content = new_dirty_content
         find_next
         find_next if replace_text.to_s.include?(find_text) && !replace_text.to_s.start_with?(find_text)
+        write_dirty_content
       end
       
       def page_up

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

@@ -218,14 +218,14 @@ module Glimmer
                 found_tab_item&.setData('file', file)
                 found_tab_item&.setData('file_path', file.path)
                 found_tab_item&.setText(file.name)
-                body_root.pack_same_size
                 if current_file
                   project_dir.selected_child_path = file_path
                 else
-                  selected_tab_item&.getData('text_editor')&.text_widget&.setFocus
+                  gladiator.selected_tab_item&.getData('text_editor')&.text_widget&.setFocus
                 end
                 async_exec {
                   swt_widget.showItem(edited_tree_item)
+                  gladiator.body_root.pack_same_size
                 }
               end
             end

data/lib/views/glimmer/gladiator.rb

@@ -96,11 +96,12 @@ module Glimmer
     ## Uncomment before_body block to pre-initialize variables to use in body
     #
     #
-    before_body {
+    before_body do
+      @@quitting = false
       # TODO consider doing loading project files after displaying the GUI instead of holding it up before
-      project_dir #pre-initialize directory
-      TOPLEVEL_BINDING.receiver.send(:at_exit) do
-        project_dir.selected_child&.write_raw_dirty_content
+      project_dir unless app_mode? #pre-initialize directory
+      TOPLEVEL_BINDING.receiver.send(:trap, "SIGINT") do |signal|
+        quit
       end
       Display.setAppName('Gladiator')
       Display.setAppVersion(VERSION)
@@ -108,20 +109,12 @@ module Glimmer
       unless defined?(@@display)
         @@display = display {
           # TODO look into why a weird java dialog comes up on about (maybe a non-issue once packaged)
-          on_about {
-            display_about_dialog
-          }
-          on_quit {
-            display.swt_display.shells.each { |shell|
-              gladiator = shell.get_data('custom_shell')
-              gladiator.project_dir.selected_child&.write_dirty_content
-              shell.close
-            }
-          }
-          on_swt_keydown { |key_event|
+          on_about { display_about_dialog }
+          on_quit { quit }
+          on_swt_keydown do |key_event|
             focused_gladiator = display.focus_control.shell&.get_data('custom_shell')
             focused_gladiator.handle_display_shortcut(key_event) if !focused_gladiator.nil? && focused_gladiator.is_a?(Glimmer::Gladiator) && key_event.widget.shell == focused_gladiator&.swt_widget
-          }
+          end
         }
       end
 
@@ -132,119 +125,121 @@ module Glimmer
         @config = {}
         load_config_ignore_paths
       end
-    }
+    end
 
     ## Uncomment after_body block to setup observers for widgets in body
     #
-    after_body {
-      observe(project_dir, 'children') do
-        @file_explorer_tree.select_tree_item unless Gladiator.startup
-      end
-      observe(project_dir, 'selected_child') do |selected_file|
-        if selected_file
-          if Gladiator.drag && !@tab_folder2
-            self.tab_folder1 = current_tab_folder
-            @tab_folder_sash_form.content {
-              self.current_tab_folder = self.tab_folder2 = text_editor_group_tab_folder
-              @current_tab_folder.swt_widget.setData('proxy', @current_tab_folder)
-            }
-            body_root.pack_same_size
-          end
+    after_body do
+      unless app_mode?
+        observe(project_dir, 'children') do
           @file_explorer_tree.select_tree_item unless Gladiator.startup
-          found_tab_item = selected_tab_item
-          if found_tab_item
-            @current_tab_folder.swt_widget.setSelection(found_tab_item)
-            @current_tab_item = found_tab_item.getData('proxy')
-            @current_text_editor = found_tab_item.getData('text_editor') unless found_tab_item.getData('text_editor').nil?
-            @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
-          else
-            begin
-              @current_tab_folder.content {
-                @current_tab_item = tab_item { |the_tab_item|
-                  text selected_file.name
-                  fill_layout(:horizontal) {
-                   margin_width 0
-                   margin_height 0
-                  }
-                  tab_folder = nil
-                  the_text_editor = nil
-                  the_tab_item.content {
-                    @current_text_editor = the_text_editor = text_editor(project_dir: project_dir, file: selected_file) {
-                      layout_data :fill, :fill, true, true
+        end
+        observe(project_dir, 'selected_child') do |selected_file|
+          if selected_file
+            if Gladiator.drag && !@tab_folder2
+              self.tab_folder1 = current_tab_folder
+              @tab_folder_sash_form.content {
+                self.current_tab_folder = self.tab_folder2 = text_editor_group_tab_folder
+                @current_tab_folder.swt_widget.setData('proxy', @current_tab_folder)
+              }
+              body_root.pack_same_size
+            end
+            @file_explorer_tree.select_tree_item unless Gladiator.startup
+            found_tab_item = selected_tab_item
+            if found_tab_item
+              @current_tab_folder.swt_widget.setSelection(found_tab_item)
+              @current_tab_item = found_tab_item.getData('proxy')
+              @current_text_editor = found_tab_item.getData('text_editor') unless found_tab_item.getData('text_editor').nil?
+              @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
+            else
+              begin
+                @current_tab_folder.content {
+                  @current_tab_item = tab_item { |the_tab_item|
+                    text selected_file.name
+                    fill_layout(:horizontal) {
+                     margin_width 0
+                     margin_height 0
                     }
-                    @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
-                    the_tab_item.swt_tab_item.setData('text_editor', @current_text_editor)
-                    @current_text_editor.text_proxy.content {
-                      on_focus_gained {
-                        tab_folder = the_text_editor.swt_widget.getParent.getParent
-                        self.current_tab_folder = tab_folder.getData('proxy')
-                        @current_tab_item = the_tab_item
-                        @current_text_editor = the_text_editor
-                        @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
-                        @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
-                        project_dir.selected_child = @current_tab_item.swt_tab_item.getData('file')
+                    tab_folder = nil
+                    the_text_editor = nil
+                    the_tab_item.content {
+                      @current_text_editor = the_text_editor = text_editor(project_dir: project_dir, file: selected_file) {
+                        layout_data :fill, :fill, true, true
+                      }
+                      @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
+                      the_tab_item.swt_tab_item.setData('text_editor', @current_text_editor)
+                      @current_text_editor.text_proxy.content {
+                        on_focus_gained {
+                          tab_folder = the_text_editor.swt_widget.getParent.getParent
+                          self.current_tab_folder = tab_folder.getData('proxy')
+                          @current_tab_item = the_tab_item
+                          @current_text_editor = the_text_editor
+                          @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
+                          @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
+                          project_dir.selected_child = @current_tab_item.swt_tab_item.getData('file')
+                        }
                       }
                     }
-                  }
-                  on_swt_show {
-                    @current_tab_item = the_tab_item
-                    @current_text_editor = the_text_editor
-                    self.current_tab_folder = @current_tab_item.swt_widget.getParent.getData('proxy')
-                    @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
-                    @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
-                    project_dir.selected_child = selected_file
-                    @current_text_editor&.load_content
-                    @current_text_editor&.text_widget&.setFocus
-                    save_config unless selected_file.nil?
-                  }
-                  on_widget_disposed {
-                    project_dir.selected_child&.write_dirty_content
-                    tab_item_file = the_tab_item.swt_tab_item.get_data('file')
-                    if (@tab_folder1 != @current_tab_folder && !@tab_folder1&.items&.detect {|ti| ti.get_data('file') == tab_item_file}) || (@tab_folder2 != @current_tab_folder && !@tab_folder2&.items&.detect {|ti| ti.get_data('file') == tab_item_file})
-                      tab_item_file.close
+                    
+                    on_swt_show do
+                      @current_tab_item = the_tab_item
+                      @current_text_editor = the_text_editor
+                      self.current_tab_folder = @current_tab_item.swt_widget.getParent.getData('proxy')
+                      @current_tab_folder.swt_widget.setData('selected_tab_item', @current_tab_item)
+                      @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
+                      project_dir.selected_child = selected_file
+                      @current_text_editor&.load_content
+                      @current_text_editor&.text_widget&.setFocus
+                      save_config unless selected_file.nil?
+                    end
+                    
+                    on_widget_disposed do
+                      project_dir.selected_child&.write_dirty_content
+                      tab_item_file = the_tab_item.swt_tab_item.get_data('file')
+                      tab_item_file.close if !@@quitting && (@tab_folder1 != @current_tab_folder && !@tab_folder1&.items&.detect {|ti| ti.get_data('file') == tab_item_file}) || (@tab_folder2 != @current_tab_folder && !@tab_folder2&.items&.detect {|ti| ti.get_data('file') == tab_item_file})
                     end
                   }
+                  @current_tab_item.swt_tab_item.setData('file_path', selected_file.path)
+                  @current_tab_item.swt_tab_item.setData('file', selected_file)
+                  @current_tab_item.swt_tab_item.setData('proxy', @current_tab_item)
                 }
-                @current_tab_item.swt_tab_item.setData('file_path', selected_file.path)
-                @current_tab_item.swt_tab_item.setData('file', selected_file)
-                @current_tab_item.swt_tab_item.setData('proxy', @current_tab_item)
-              }
-              @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
-              body_root.pack_same_size
-            rescue => e
-              Glimmer::Config.logger.error {e.full_message}
+                @current_tab_folder.swt_widget.setSelection(@current_tab_item.swt_tab_item)
+                body_root.pack_same_size
+              rescue => e
+                Glimmer::Config.logger.error {e.full_message}
+              end
             end
+            @current_text_editor&.text_widget&.setFocus
           end
-          @current_text_editor&.text_widget&.setFocus
         end
-      end
-      observe(self, 'maximized_pane') do
-        if tab_folder2
-          @tab_folder_sash_form.maximized_control = (current_tab_folder.swt_widget if maximized_pane?)
+        observe(self, 'maximized_pane') do
+          if tab_folder2
+            @tab_folder_sash_form.maximized_control = (current_tab_folder.swt_widget if maximized_pane?)
+          end
         end
-      end
-      observe(self, 'maximized_editor') do
-        @file_area_and_editor_area_sash_form.maximized_control = (@editor_area_composite.swt_widget if maximized_editor?)
-        if !maximized_editor?
-          expand_navigation_expand_bar_height
-        else
-          collapse_navigation_expand_bar_height
+        observe(self, 'maximized_editor') do
+          @file_area_and_editor_area_sash_form.maximized_control = (@editor_area_composite.swt_widget if maximized_editor?)
+          if !maximized_editor?
+            expand_navigation_expand_bar_height
+          else
+            collapse_navigation_expand_bar_height
+          end
+          @navigation_expand_item.swt_expand_item.set_expanded !maximized_editor?
+          body_root.pack_same_size
+          async_exec { body_root.pack_same_size }
         end
-        @navigation_expand_item.swt_expand_item.set_expanded !maximized_editor?
-        body_root.pack_same_size
-        async_exec { body_root.pack_same_size }
-      end
-      observe(project_dir, 'selected_child') do
-        save_config
-      end
-      observe(project_dir, 'selected_child.caret_position') do
-        save_config
-      end
-      observe(project_dir, 'selected_child.top_pixel') do
-        save_config
+        observe(project_dir, 'selected_child') do
+          save_config
+        end
+        observe(project_dir, 'selected_child.caret_position') do
+          save_config
+        end
+        observe(project_dir, 'selected_child.top_pixel') do
+          save_config
+        end
+        load_config
       end
-      load_config unless app_mode?
-    }
+    end
 
     ## Add widget content inside custom shell body
     ## Top-most widget must be a shell or another custom shell
@@ -287,6 +282,7 @@ module Glimmer
           on_shell_closed {
             project_dir.selected_child&.write_dirty_content
             save_config
+            @paused_save_config = true
             if @tab_folder2
               current_tab_folder.swt_widget.getItems.each do |tab_item|
                 tab_item.getData('proxy')&.dispose
@@ -297,6 +293,7 @@ module Glimmer
               tab_item.getData('proxy')&.dispose
             end
             gladiator_shells = display.shells.select {|s| s.get_data('custom_shell')&.is_a?(Glimmer::Gladiator)}
+            project_dir.close unless @@quitting
             body_root.close unless current_tab_folder.swt_widget.getItems.empty?
             async_exec { @@app_mode_shell.show } if defined?(@@app_mode_shell) && gladiator_shells.count <= 2
           }
@@ -766,28 +763,28 @@ module Glimmer
               project_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
             end
           }
-          async_exec {
+          async_exec do
             Gladiator.drag = false
             @progress_shell&.close
             @progress_shell = nil
             @loaded_config = true
-          }
+          end
         }
-        async_exec {
+        async_exec do
           Thread.new {
             all_files = open_file_paths1.to_a + open_file_paths2.to_a
             all_files.each do |file|
               project_dir.find_child_file(file)&.dirty_content
             end
           }
-        }
+        end
       else
         @loaded_config = true
       end
     end
 
     def save_config
-      return if !@loaded_config || body_root&.disposed?
+      return if !@loaded_config || body_root&.disposed? || @paused_save_config
       child = project_dir.selected_child
       return if child.nil?
       tab_folder1 = @tab_folder1 || @current_tab_folder
@@ -918,7 +915,7 @@ module Glimmer
       async_exec {
         @progress_shell.open
       }
-      async_exec {
+      async_exec do
         gladiator(project_dir_path: selected_directory) {
           on_swt_show {
             @@app_mode_shell.hide if app_mode?
@@ -926,6 +923,15 @@ module Glimmer
             @progress_shell = nil
           }
         }.open if selected_directory
+      end
+    end
+    
+    def quit
+      @@quitting = true
+      display.shells.each { |shell|
+        gladiator = shell.get_data('custom_shell')
+        gladiator.project_dir.selected_child&.write_dirty_content unless app_mode?
+        shell.get_data('proxy').close
       }
     end
     

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.20.15.4
+        version: 4.20.16.0
   name: glimmer-dsl-swt
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.20.15.4
+        version: 4.20.16.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.5
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 9.2.19.0
+  name: jruby-jars
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 9.2.19.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -121,6 +135,7 @@ executables:
 - gladiator-setup
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files: