glimmer-cs-gladiator 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d01657c9b03099dad70892558d43a585ff5d26a01227081cd94a3b8b9d8f224a
-  data.tar.gz: d81be798b72b493faaf307b3e888fe1a02bd4bfe6e609d1171e6720254a178d5
+  metadata.gz: d2be1b2aad1f764036be0f36a95a217e51f93609c05855b48c9574144872f9da
+  data.tar.gz: c494f9e2ed2d472d5c600d82a6116f993253381cd20bad5983584f2d67bc7440
 SHA512:
-  metadata.gz: b6d107d000349c67c0e101e369a510683735000650cac6aa1fc0367690e5cabbd5c3777c52cd1ab72732c4ebb00abf0bbfa9d4ef3d208a1af5f056542245e0b7
-  data.tar.gz: 34d47289ce397dff8750f33be12e2aa0a3fb5efbb36a62870803f9bf7009f87541f7ed14f1028ce7a0a3abecc29700cc444f0971de69ba63891658a6f88ad849
+  metadata.gz: bcc7bedfde90a8288dd733c388d04c6aa265cc19caf11055b8ec6449a0cf5d27cbad85939c6eee8536485fc29ebabea39b928400364b28fd5a5dcd0af72a5da1
+  data.tar.gz: 8da78ae7dcea093e2357d42bf0dee6fa0bf0e5d423a2264e3f9e08da8b5230d86d7967c02637b5c290eac37ab0892513ef9c689c8308cd3a210ea2d883fc42d2

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 0.11.0
+
+- Support new file formats: 'ts' (TypeScript), 'rs' (Rust), and 'cs' (C#)
+- Use the correct single line comment prefix for each programming language (e.g. `//` in JS/Java/C and `#` in Ruby/Perl/Python)
+- Improve Undo/Redo support by storing data for in-progress text entry every 1 second (or ENV['UNDO_TIME_INTERVAL_SECONDS'] if specified) while typing to enable undoing partial text instead of everything
+- File Lookup ignores `:` in filename search terms to enable looking up files for namespaced Ruby class (e.g. `Glimmer::Gladiator::Command` will find `lib/models/glimmer/gladiator/command.rb`)
+- Upgrade to JRuby 9.3.4.0
+- Upgrade to Glimmer DSL for SWT 4.24.3.1
+
 ## 0.10.0
 
 - Upgrade to glimmer-dsl-swt 4.23.0.0

data/README.md

@@ -1,7 +1,11 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.10.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-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.11.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)
 
+(**[***Montreal.rb Talk - How I Built My Code Editor in Ruby***](https://andymaleh.blogspot.com/2022/07/montrealrb-2022-07-07-talk-how-i-built.html)**)
+
+![rapid prototyping of desktop app GUI with Gladiator](https://raw.githubusercontent.com/AndyObtiva/glimmer-dsl-swt/master/images/glimmer-dsl-swt-demo-hello-world.gif)
+
 Mac
 
 ![Gladiator](images/glimmer-gladiator.png)
@@ -10,12 +14,12 @@ Windows
 
 ![Gladiator](images/glimmer-gladiator-windows.png)
 
-[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).
+[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) beta project under on-going development that explores 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](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 [projects](https://github.com/AndyObtiva) since May of 2020.
 
-You may now [download](#download) a packaged version of [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator), including new support for Mac ARM64.
+[<img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=40 />  You may now download a packaged version of Gladiator, including new support for Mac ARM64](#download)
 
 ## Features
 
@@ -87,6 +91,7 @@ You may now [download](#download) a packaged version of [Gladiator](https://ruby
 Here is an exhaustive list of the file formats supported by [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator):
 1. C (`'c', 'h'`)
 1. C++ (`'cpp', 'cc', 'C', 'cxx', 'c++', 'hpp', 'hh', 'H', 'hxx', 'h++'`)
+1. C# (`'cs'`)
 1. Crystal (`'cr'`)
 1. CSS (`'css'`)
 1. Conf (`'conf'`)
@@ -114,12 +119,14 @@ Here is an exhaustive list of the file formats supported by [Gladiator](https://
 1. PowerShell (`'ps1'`)
 1. Python (`'py'`)
 1. Ruby (`'rb'`, `'rake'`)
+1. Rust (`'rs'`)
 1. SASS (`'sass'`)
 1. Scheme (`'scm', 'sps', 'sls', 'sld'`)
 1. SCSS (`'scss'`)
 1. Shell (`'sh'`)
 1. SQL (`'sql'`)
 1. Tcl (`'tcl'`)
+1. TypeScript (`'ts'`)
 1. Yaml (`'yaml', 'yml'`)
 1. XML (`'xml'`)
 
@@ -137,7 +144,9 @@ Here is an exhaustive list of the file formats supported by [Gladiator](https://
 
 ## Download
 
-[<img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=40 /> Download Gladiator 0.10.0 Mac DMG Installer (ARM64 Monterey & Older)](https://www.dropbox.com/s/7qagm9hsm1dyqel/Gladiator-0.10.0-arm64.dmg?dl=1)
+[<img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=40 /> Download Gladiator 0.11.0 Mac DMG Installer (ARM64 Ventura 13.4.1 & Older)](https://www.dropbox.com/scl/fi/b6t41tw0oqirbishtcncm/Gladiator-0.11.0-arm64-ventura-13.4.1.dmg?rlkey=3vq3ifq84tfjiglnttcbtgcmm&dl=1) (this version starts in about 2.5 seconds)
+
+[<img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=40 /> Download Gladiator 0.10.0 Mac DMG Installer (x64 Monterey & Big Sur)](https://www.dropbox.com/s/6155qdxv7j6hnsi/Gladiator-0.10.0-x64-monterey.dmg?dl=1)
 
 [<img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=40 /> Download Gladiator 0.10.0 Mac DMG Installer (x64 Catalina & Older)](https://www.dropbox.com/s/rxta4yio71mei8f/Gladiator-0.10.0.dmg?dl=1)
 
@@ -154,7 +163,7 @@ Note: if you encounter any issues, check if they are documented in [TODO.md](TOD
 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 -v0.10.0
+jgem install glimmer-cs-gladiator -v0.11.0
 ```
 
 Or add to a JRuby project Bundler `Gemfile` under the `:developement` group:
@@ -218,7 +227,7 @@ To reuse [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) as a Glimme
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '~> 0.10.0'
+gem 'glimmer-cs-gladiator', '~> 0.11.0'
 ```
 
 Run:
@@ -291,6 +300,10 @@ Also, if you encounter this issue with projects that contain a lot of extra file
 could later open the generated `.gladiator` file at the root of the project directory and add unnecessary subdirectories
 to the `ignore_paths` array.
 
+### Freezing in large projects
+
+Gladiator right now assumes smaller projects with a few files only as it always opens all file contents in memory for better searching. So, when a file is updated externally (e.g. change git branch), it reloads its entire tree, including all the file contents too, which causes a temporary freeze. This may get fixed in the future, but it is not annoying enough in smaller projects to be fixed right away. The change might include diffing the tree to avoid refreshing file contents for unchanged files, and perhaps multi-threaded loading of file contents to avoid freezing the GUI.
+
 ## TODO
 
 [TODO.md](TODO.md)

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.11.0

data/glimmer-cs-gladiator.gemspec

@@ -2,21 +2,20 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-cs-gladiator 0.10.0 ruby lib
+# stub: glimmer-cs-gladiator 0.11.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-cs-gladiator".freeze
-  s.version = "0.10.0"
+  s.version = "0.11.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 = "2022-07-04"
-  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.date = "2023-08-14"
+  s.description = "Gladiator (short for Glimmer Editor) is a Glimmer beta 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"
   ]
@@ -54,22 +53,20 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, ["~> 4.24.0.0"])
+    s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, ["~> 4.24.3.1"])
     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.24.0.0"])
+    s.add_dependency(%q<glimmer-dsl-swt>.freeze, ["~> 4.24.3.1"])
     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/command.rb

@@ -38,13 +38,12 @@ module Glimmer
         
         def do(file, method = nil, *args, command: nil)
           if command.nil?
-            command ||= Command.new(file, method, *args)
+            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
+            save_new_command = command_history_for(file).last.method == :change_content! && method == :change_content! && !time_for_new_command?
+            command_history_for(file).last.next_command = command unless save_new_command
             command.do
-            command_history_for(file) << command unless command_history_for(file).last.method == :change_content! && method == :change_content!
+            command_history_for(file) << command unless save_new_command
           else
             command_history_for(file) << command
           end
@@ -64,7 +63,16 @@ module Glimmer
         def clear(file)
           command_history[file] = [Command.new(file)]
         end
+        
+        def time_for_new_command?
+          @time ||= Time.now
+          time_for_new_command = (Time.now - @time) > TIME_INTERVAL_SECONDS_NEW_COMMAND
+          @time = Time.now if time_for_new_command
+          time_for_new_command
+        end
       end
+      
+      TIME_INTERVAL_SECONDS_NEW_COMMAND = (ENV['UNDO_TIME_INTERVAL_SECONDS'] || 1).to_f # seconds
     
       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

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

@@ -28,6 +28,7 @@ module Glimmer
       include Glimmer::DataBinding::ObservableModel
       
       IGNORE_PATHS = ['.gladiator', '.gladiator-scratchpad', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor', 'pkg', 'dist', 'log', 'test/reports']
+      REGEXP_FILTER = /[:_\/.-]/
 
       attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :display_path, :ignore_paths
       attr_reader :name, :parent, :path
@@ -184,7 +185,7 @@ module Glimmer
         children_files.select do |child|
           child_path = child.path.to_s.sub(project_dir.path, '')
           child_path.downcase.include?(filter.downcase) ||
-            child_path.downcase.gsub(/[_\/.-]/, '').include?(filter.downcase.gsub(/[_\/.-]/, ''))
+            child_path.downcase.gsub(REGEXP_FILTER, '').include?(filter.downcase.gsub(REGEXP_FILTER, ''))
         end.sort_by {|c| c.path.to_s.downcase}
       end
   

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

@@ -41,9 +41,12 @@ module Glimmer
         @init = nil
       end
       
+      def extension
+        path.split('.').last if path.to_s.include?('.')
+      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')
@@ -58,6 +61,8 @@ module Glimmer
           'cpp'
         when 'cr'
           'crystal'
+        when 'cs'
+          'csharp'
         when 'css'
           'css'
         when 'conf'
@@ -66,6 +71,8 @@ module Glimmer
           'coffeescript'
         when 'erb'
           'erb'
+        when 'ex', 'exs'
+          'eex'
         when 'feature'
           'gherkin'
         when 'gradle'
@@ -106,6 +113,8 @@ module Glimmer
           'powershell'
         when 'py'
           'python'
+        when 'rs'
+          'rust'
         when 'rb', 'rake'
           'ruby'
         when 'sass'
@@ -120,15 +129,84 @@ module Glimmer
           'sql'
         when 'tcl'
           'tcl'
+        when 'ts'
+          'typescript'
+        when 'tsx'
+          'tsx'
         when 'txt', nil
           'plain_text'
         when 'yaml', 'yml'
           'yaml'
         when 'xml'
           'xml'
+        else
+          'plain_text'
+        end
+      end
+      
+      def single_line_comment_prefix
+        case extension
+        when 'c', 'h',
+             'cpp', 'cc', 'C', 'cxx', 'c++', 'hpp', 'hh', 'H', 'hxx', 'h++',
+             'cs',
+             'gradle',
+             'java',
+             'js', 'cjs', 'mjs', 'es6', 'es',
+             'jsx',
+             'kt', 'ktm', 'kts',
+             'rs',
+             'ts',
+             'tsx',
+             'sass',
+             'scss'
+          '//'
+        when 'cr',
+             'conf',
+             'coffee',
+             'ex', 'exs',
+             'feature',
+             'ini',
+             'pl',
+             'pp',
+             'properties',
+             'ps1',
+             'py',
+             'rb', 'rake',
+             'sh',
+             'tcl',
+             'yaml', 'yml'
+          '#'
+        when 'css'
+          '/*'
+        when 'erb',
+             'html',
+             'jsp',
+             'plist',
+             'xml'
+          # TODO in the future, have .erb support `#` single line comment inside Ruby code scriptlets as opposed to scriptlet-free code
+          '<!--'
+        when 'haml'
+          '/'
+        when 'md', 'markdown'
+          '<!---'
+        when 'ps'
+          '%'
+        when 'scm', 'sps', 'sls', 'sld'
+          ';'
+        when 'sql'
+          '--'
+        when 'json',
+             'patch',
+             'txt',
+             nil
+          nil
+        else
+          '#'
         end
       end
       
+      # TODO support: def single_line_comment_postfix
+      
       def init_content
         unless @init
           @init = true
@@ -386,14 +464,17 @@ module Glimmer
           delta = 0
           the_line = old_lines[the_line_index]
           return if the_line.nil?
-          if the_line.strip.start_with?('# ')
-            new_lines[the_line_index] = the_line.sub(/# /, '')
+          if the_line.strip.start_with?("#{single_line_comment_prefix} ")
+            new_lines[the_line_index] = the_line.sub(/#{single_line_comment_prefix} /, '')
+            # TODO single_line_comment_postfix if needed
             delta -= 2
-          elsif the_line.strip.start_with?('#')
-            new_lines[the_line_index] = the_line.sub(/#/, '')
+          elsif the_line.strip.start_with?(single_line_comment_prefix)
+            new_lines[the_line_index] = the_line.sub(/#{single_line_comment_prefix}/, '')
+            # TODO single_line_comment_postfix if needed
             delta -= 1
           else
-            new_lines[the_line_index] = "# #{the_line}"
+            new_lines[the_line_index] = "#{single_line_comment_prefix} #{the_line}"
+            # TODO single_line_comment_postfix if needed
             delta += 2
           end
         end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-04 00:00:00.000000000 Z
+date: 2023-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.24.0.0
+        version: 4.24.3.1
   name: glimmer-dsl-swt
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.24.0.0
+        version: 4.24.3.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -94,20 +94,6 @@ 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:
@@ -122,7 +108,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Gladiator (short for Glimmer Editor) is a Glimmer sample project under
+description: Gladiator (short for Glimmer Editor) is a Glimmer beta 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
@@ -135,7 +121,6 @@ executables:
 - gladiator-setup
 extensions: []
 extra_rdoc_files:
-- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files: