glimmer-cs-gladiator 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4027589accf83fa2244350dc416c3ab56bf28c9f65cbf3288d96c0b5f13c27aa
-  data.tar.gz: 11e18e7f18605188cd151e4e8307b10dc808b9059a7f275d3a37c1a1ba3cc65a
+  metadata.gz: 6af7b2892ce6c1f52db5e004fdfd8e2cee83f73a9c8fd35a2e92d82b8bc9f186
+  data.tar.gz: 47b746faacc0d7fac31802abb54efb6b90ba56246c0dbef05186f59602b1547c
 SHA512:
-  metadata.gz: c774eaa5fb91c4a5ceb08aa98715ab32bddcea61c4793b3d0dfd74119142c2245c7574835dda59d698239b8be3448d1d7fc76fe801643b53d4aa236b3a6bd54e
-  data.tar.gz: cab4d312f803a8e93fb5d7954ffd7319092ae4a1c9d827dca95b5670c22ef484475c34989b109b91f922f126a73eea94d7c73b56d53fa6781075011419b8d1fb
+  metadata.gz: 566d39ec4b7437e7562339c419045337274d96ad8d477e31d357c8df124725c2fae07e7d72ebf3ca0606ce33bb7ce3c628893071d41cd75634dbab890575f9e6
+  data.tar.gz: 67b3db63a6e55b6d5a641ab9466abd58e2d06c930133b7b010f71dda56629501ffd0beec80d26d77ca615193d53ef13bc2f697b0a0b4e0cd7bd7f21c4164eaef

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 0.8.0
+
+- Upgrade to glimmer-dsl-swt v4.18.3.5
+- Multiple language syntax highlighting support (over 20 languages) via the new code_text language option in Glimmer DSL for SWT
+- Refactor code to use display on_quit event (instead of manual SWT code for quitting on the Mac)
+- Fix issue with Reset All not working
+- Fix issue with CMD+F not revealing Navigation Area when in Maximized Editor Mode
+
 ## 0.7.3
 
 - Add gladiator-setup to make gladiator executable available everywhere

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.7.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.8.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)
 
@@ -9,6 +9,8 @@ It is not intended to be a full-fledged editor by any means, yet mostly a fun ed
 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.
 
+You may now [download](#download) a packaged version on the Mac.
+
 ## Features
 
 Gladiator currently supports the following text editing features (including keyboard shortcuts with Mac CMD=CTRL on Windows/Linux)
@@ -17,7 +19,7 @@ Gladiator currently supports the following text editing features (including keyb
 
 ### Text Editor
 
-- Text Editor with Colored Ruby Syntax Highlighting
+- Text Editor with Colored Syntax Highlighting for [Multiple Languages](#multiple-language-syntax-highlighting)
 - Show Line Numbers
 - 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)
@@ -74,6 +76,34 @@ Gladiator currently supports the following text editing features (including keyb
 - 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
 
+### Multiple Language Syntax Highlighting
+
+- Ruby
+- Markdown
+- JavaScript
+- JSON
+- Yaml
+- HTML
+- C
+- Haskell
+- Gradle
+- C++
+- CSS
+- Java
+- JSP
+- plist
+- Haml
+- XML
+- INI
+- Perl
+- Tcl
+- SASS
+- SCSS
+- SQL
+- Shell (Bash / Zsh)
+- Vue
+- Plain Text
+
 ## Platforms
 
 - Mac: Gladiator works best on the Mac. This is the platform it is most used on and receives the most maintenance for.
@@ -84,11 +114,11 @@ Gladiator currently supports the following text editing features (including keyb
 
 - [JDK](https://www.oracle.com/java/technologies/javase-downloads.html): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer-dsl-swt)
 - [JRuby](https://www.jruby.org/download): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer-dsl-swt)
-- [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Framework): '>= 4.17.2.0', '< 5.0.0.0' (dependency included in Ruby gem).
+- [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Framework) (dependency included in Ruby gem).
 
 ## Download
 
-You may download a [packaged version of the Gladiator app](https://www.dropbox.com/s/kcr20unx7obs6z2/Gladiator-0.7.3.dmg?dl=1) on the Mac.
+You may [download a packaged version of the Gladiator app](https://www.dropbox.com/s/pzkvm6uh14ngrr2/Gladiator-0.8.0.dmg?dl=1) on the Mac.
 
 Otherwise, if you prefer a command line version, then follow the Setup Instructions below.
 
@@ -164,7 +194,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '>= 0.7.3'
+gem 'glimmer-cs-gladiator', '>= 0.8.0'
 ```
 
 Run:
@@ -195,7 +225,7 @@ Gladiator automatically saves configuration data in a `.gladiator` file at the d
 It currently remembers:
 - Last opened files (in both split panes if split)
 - Window size and position
-- Ignore Paths (default: '.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor')
+- Ignore Paths under `Glimmer::Gladiator::Dir::IGNORE_PATHS` (default: `['.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor', 'pkg', 'dist']`)
 
 ## Gotcha
 

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.8.0

data/glimmer-cs-gladiator.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-cs-gladiator 0.7.3 ruby lib
+# stub: glimmer-cs-gladiator 0.8.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-cs-gladiator".freeze
-  s.version = "0.7.3"
+  s.version = "0.8.0"
 
   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-01-20"
+  s.date = "2021-02-01"
   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]
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.0.2", "< 5.0.0.0"])
+      s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.3.5", "< 5.0.0.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"])
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<warbler>.freeze, ["= 2.0.5"])
       s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.0.2", "< 5.0.0.0"])
+      s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.3.5", "< 5.0.0.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"])
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.0.2", "< 5.0.0.0"])
+    s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.3.5", "< 5.0.0.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"])

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

@@ -5,6 +5,8 @@ module Glimmer
     class Dir
       include Glimmer
       include Glimmer::DataBinding::ObservableModel
+      
+      IGNORE_PATHS = ['.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor', 'pkg', 'dist']
 
       attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :display_path, :ignore_paths
       attr_reader :name, :parent, :path
@@ -36,7 +38,7 @@ module Glimmer
         end
         self.path = ::File.expand_path(path)
         @name = ::File.basename(::File.expand_path(path))
-        @ignore_paths = ['.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor', 'pkg']
+        @ignore_paths = IGNORE_PATHS
         self.filtered_path_options = []
       end
       
@@ -72,8 +74,10 @@ module Glimmer
       def retrieve_children
         @children = ::Dir.glob(::File.join(@path, '*')).reject do |p|
           # TODO make sure to configure ignore_paths in a preferences dialog
-          project_dir.ignore_paths.reduce(false) do |result, ignore_path|
-            result || p.include?(ignore_path)
+          if project_dir == self
+            project_dir.ignore_paths.any? do |ignore_path|
+              p.include?(ignore_path)
+            end
           end
         end.map do |p|
           ::File.file?(p) ? File.new(p, project_dir) : Dir.new(p, project_dir)
@@ -93,7 +97,7 @@ module Glimmer
       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)
+            return child if child.path.include?(file_path.to_s)
           else
             result = depth_first_search_file(child, file_path)
             return result unless result.nil?

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

@@ -20,6 +20,69 @@ module Glimmer
         @init = nil
       end
       
+      def language
+        # TODO consider using Rouge::Lexer.guess_by_filename instead and perhaps guess_by_source when it fails
+        extension = path.split('.').last if path.to_s.include?('.')
+        return 'ruby' if scratchpad?
+        return 'ruby' if path.to_s.end_with?('Gemfile') || path.to_s.end_with?('Rakefile')
+        return 'ruby' if dirty_content.start_with?('#!/usr/bin/env ruby') || dirty_content.start_with?('#!/usr/bin/env jruby')
+        return 'yaml' if path.to_s.end_with?('Gemfile.lock')
+        return 'shell' if extension.nil? && path.to_s.include?('/bin/')
+        case extension
+        # TODO extract case statement to an external config file
+        when 'rb'
+          'ruby'
+        when 'md', 'markdown'
+          'markdown'
+        when 'js', 'es6'
+          'javascript'
+        when 'json'
+          'json'
+        when 'yaml'
+          'yaml'
+        when 'html'
+          'html'
+        when 'h', 'c'
+          'c'
+        when 'hs'
+          'haskell'
+        when 'gradle'
+          'gradle'
+        when 'cpp'
+          'cpp'
+        when 'css'
+          'css'
+        when 'java'
+          'java'
+        when 'jsp'
+          'jsp'
+        when 'plist'
+          'plist'
+        when 'haml'
+          'haml'
+        when 'xml'
+          'xml'
+        when 'ini'
+          'ini'
+        when 'pl'
+          'perl'
+        when 'tcl'
+          'tcl'
+        when 'sass'
+          'sass'
+        when 'scss'
+          'scss'
+        when 'sql'
+          'sql'
+        when 'sh'
+          'shell'
+        when 'vue'
+          'vue'
+        when 'txt', nil
+          'plain_text'
+        end
+      end
+      
       def init_content
         unless @init
           @init = true

data/lib/views/glimmer/gladiator.rb

@@ -82,7 +82,7 @@ module Glimmer
       pane_count && pane_count > 1
     end
     
-    attr_reader :find_text, :filter_text, :line_number_text, :split_orientation, :tab_folder_sash_form, :side_bar_sash_form, :file_area_and_editor_area_sash_form
+    attr_reader :find_text, :filter_text, :line_number_text, :split_orientation, :tab_folder_sash_form, :side_bar_sash_form, :file_area_and_editor_area_sash_form, :file_explorer_expand_item, :file_explorer_expand_item, :file_lookup_expand_item, :file_explorer_expand_item, :file_lookup_expand_item_height, :file_explorer_expand_item_height
     attr_accessor :current_tab_item, :current_tab_folder, :current_text_editor, :tab_folder1, :tab_folder2, :maximized_pane, :maximized_editor
     alias maximized_pane? maximized_pane
     alias maximized_editor? maximized_editor
@@ -105,6 +105,11 @@ module Glimmer
           on_about {
             display_about_dialog
           }
+          on_quit {
+            save_config
+            project_dir.selected_child&.write_dirty_content
+            display.swt_display.shells.each(&:close)
+          }
           on_swt_keydown { |key_event|
             focused_gladiator = display.focus_control.shell&.get_data('custom_shell')
             focused_gladiator.handle_display_shortcut(key_event) if !focused_gladiator.nil? && key_event.widget.shell == focused_gladiator&.swt_widget
@@ -158,7 +163,9 @@ module Glimmer
                 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)
+                  @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 {
@@ -285,14 +292,6 @@ module Glimmer
             project_dir.selected_child&.write_dirty_content
           }
   
-          if OS.mac?
-            display.swt_display.system_menu.items.find {|mi| mi.id == swt(:id_quit)}.add_selection_listener {
-              save_config
-              project_dir.selected_child&.write_dirty_content
-              display.swt_display.shells.each(&:close)
-            }
-          end
-  
           # Menu Bar
           gladiator_menu_bar(gladiator: self, editing: true)
           
@@ -922,22 +921,15 @@ module Glimmer
     
     def handle_display_shortcut(key_event)
       if key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'f'
-        find_action = lambda do
-          if current_text_editor&.text_widget&.getSelectionText && current_text_editor&.text_widget&.getSelectionText&.size.to_i > 0
-            find_text.swt_widget.setText current_text_editor.text_widget.getSelectionText
-          end
-          find_text.swt_widget.selectAll
-          find_text.swt_widget.setFocus
-        end
-        if @navigation_expand_item.swt_expand_item.get_expanded
-          find_action.call
-        else
+        if !@navigation_expand_item.swt_expand_item.get_expanded
+          expand_navigation_expand_bar_height
           @navigation_expand_item.swt_expand_item.set_expanded true
-          async_exec {
-            body_root.pack_same_size
-            find_action.call
-          }
         end
+        if current_text_editor&.text_widget&.getSelectionText && current_text_editor&.text_widget&.getSelectionText&.size.to_i > 0
+          find_text.swt_widget.setText current_text_editor.text_widget.getSelectionText
+        end
+        find_text.swt_widget.selectAll
+        find_text.swt_widget.setFocus
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'c'
         Clipboard.copy(project_dir.selected_child.path)
       elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'g'

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

@@ -118,9 +118,17 @@ module Glimmer
                 text '&Reset All'
                 accelerator COMMAND_KEY, :ctrl, :r
                 on_widget_selected {
-                  gladiator.tab_folder_sash_form.maximized_editor = false
-                  gladiator.tab_folder_sash_form.file_area_and_editor_area_sash_form.weights = [1, 5]
-                  gladiator.tab_folder_sash_form.side_bar_sash_form.weights = [1, 1]
+                  gladiator.maximized_editor = false
+                  gladiator.file_area_and_editor_area_sash_form.weights = [1, 5]
+                  gladiator.side_bar_sash_form.weights = [1, 1]
+                  unless gladiator.file_lookup_expand_item.swt_expand_item.get_expanded
+                    gladiator.file_lookup_expand_item.swt_expand_item.set_expanded true
+                    gladiator.file_lookup_expand_item.swt_expand_item.height = gladiator.file_lookup_expand_item_height if gladiator.file_lookup_expand_item_height
+                  end
+                  unless gladiator.file_explorer_expand_item.swt_expand_item.get_expanded
+                    gladiator.file_explorer_expand_item.swt_expand_item.set_expanded true
+                    gladiator.file_explorer_expand_item.swt_expand_item.height = gladiator.file_explorer_expand_item_height if gladiator.file_explorer_expand_item_height
+                  end
                 }
               }
             }

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

@@ -39,7 +39,7 @@ module Glimmer
       body {
         composite {
           grid_layout(2, false)
-          layout_data :fill, :fill, true, true
+          
           @line_numbers_text = styled_text(:multi, :border) {
             layout_data(:right, :fill, false, true)
             text ' '*4
@@ -62,7 +62,7 @@ module Glimmer
             }
           }
           
-          @text_proxy = send(text_widget_keyword) { |the_text|
+          @text_proxy = code_text(language: file.language) {
             layout_data :fill, :fill, true, true
             font name: @font_name, height: OS.mac? ? 15 : 12
             foreground rgb(75, 75, 75)
@@ -97,11 +97,6 @@ module Glimmer
         nil
       end
            
-      def text_widget_keyword
-        is_code_file = file.scratchpad? || file.path.end_with?('.rb')
-        is_code_file ? 'code_text' : 'styled_text'
-      end
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 
       def text_widget
         @text_proxy.swt_widget
       end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.18.0.2
+        version: 4.18.3.5
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.18.0.2
+        version: 4.18.3.5
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0