glimmer-cs-gladiator 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fe3696b0a87eb8158d519cbe9480113e82226259d547020ca9fababe255d5d3
-  data.tar.gz: c8af0b5d4917d7373367941a59c06dc79ed171cc13295588a35c09e6b9b98f9c
+  metadata.gz: 50c948ac2d53e7ef62aadbff64f59c682f06c92cd27081e4dad7c4425c7a3a4b
+  data.tar.gz: 49a7ed90eab1755cfeb33fed1cda1822eb07475e39cfe36764d48391d031f7fe
 SHA512:
-  metadata.gz: ee65bef582e89f4791b0b4f2f682d143a0b793a6fa2bc6afcfa094d1ee0fae8823b03ab88e1bf57cbbac7a10204fc3e10be12f281c1a7f73bf56368008d2b326
-  data.tar.gz: 43e2c2563d1121027563d5985ce716ecb0e2a7e57846fb88a2b20340b6ae60127fca85e79dca29a00d5aa60dee3d1fc211ea0eac008e428d513cd1f798876e49
+  metadata.gz: e0ae0e356af6aff227f53347d939d8506a100894ec370c380ff2eb1409b4f53ec9f70059645ddc2e940210817b3601224a2bb2338d8529a33749c26949239660
+  data.tar.gz: 3cde078579d1ab2ecc16ea01d26731585a0a201506805e063b593d5e91ce1508e9fecd357d4503b83889c9c69719bec54c53c5ec6f72a3bde6adda336c4a0fc0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.11.2
+
+- Support 'lisp', 'cl', 'el', 'asd' file formats
+- Fix issue with not being able to comment/uncomment in `Gemfile`
+- Fix issue with zoom (via -, =, 0) not zooming line numbers too.
+
 ## 0.11.1
 
 - [CONTRIBUTION BY keeperotphones] Support Ruby file formats: `'rbw', 'gemspec'`

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.11.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.11.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)
 
@@ -88,7 +88,7 @@ I leave building truly professional text editors to software tooling experts who
 
 ### Multiple Language Syntax Highlighting
 
-Here is an exhaustive list of the file formats supported by [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator):
+Here is an exhaustive list of all the file formats supported by [Gladiator](https://rubygems.org/gems/glimmer-cs-gladiator) (if you would like support for more file formats, feel free to suggest in a [GitHub Issue](https://github.com/AndyObtiva/glimmer-cs-gladiator/issues) or submit a [Pull Request](https://github.com/AndyObtiva/glimmer-cs-gladiator/pulls)):
 1. C (`'c', 'h'`)
 1. C++ (`'cpp', 'cc', 'C', 'cxx', 'c++', 'hpp', 'hh', 'H', 'hxx', 'h++'`)
 1. C# (`'cs'`)
@@ -110,6 +110,7 @@ Here is an exhaustive list of the file formats supported by [Gladiator](https://
 1. JSP (`'jsp'`)
 1. JSX (`'jsx'`)
 1. Kotlin (`'kt', 'ktm', 'kts'`)
+1. Lisp (`'lisp', 'cl', 'el', 'asd'`)
 1. Make (`'Makefile', 'makefile', 'GNUmakefile'`)
 1. Markdown (`'md', 'markdown'`)
 1. Diff Patch (`'patch'`)
@@ -147,9 +148,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.11.1 Mac DMG Installer (ARM64 Ventura 13.4.1 & Older)](https://www.dropbox.com/scl/fi/iyyubcqekhtn4rv91feka/Gladiator-0.11.1-arm64-ventura-13.4.1.dmg?rlkey=ht2bt4jqf6bmgfjy0aurt2fem&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.11.2 Mac DMG Installer (ARM64 Ventura 13.4.1 & Older)](https://www.dropbox.com/scl/fi/456pqc4th4q2yjlue2y8o/Gladiator-0.11.2-arm64-ventura-13.4.1.dmg?rlkey=qsdvshabpolvgev6w7ku4ana9&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.11.1 Mac DMG Installer (x64 Ventura 13.4.1 & Older)](https://www.dropbox.com/scl/fi/04y1zkslld876cqv3mbls/Gladiator-0.11.1-x86_64-ventura-13.4.1.dmg?rlkey=0dhzhcejgx31w6iuj3qs2z7zs&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)
 
@@ -166,7 +167,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.11.1
+jgem install glimmer-cs-gladiator -v0.11.2
 ```
 
 Or add to a JRuby project Bundler `Gemfile` under the `:developement` group:
@@ -230,7 +231,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.11.1'
+gem 'glimmer-cs-gladiator', '~> 0.11.2'
 ```
 
 Run:

data/VERSION

@@ -1 +1 @@
-0.11.1
+0.11.2

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.11.1 ruby lib
+# stub: glimmer-cs-gladiator 0.11.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-cs-gladiator".freeze
-  s.version = "0.11.1"
+  s.version = "0.11.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 = "2023-08-15"
+  s.date = "2023-09-07"
   s.description = "Gladiator (short for Glimmer Editor) is a Code Editor / IDE 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.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer-cs-gladiator".freeze, "gladiator".freeze, "gladiator-setup".freeze]

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

@@ -97,6 +97,8 @@ module Glimmer
           'jsx'
         when 'kt', 'ktm', 'kts'
           'kotlin'
+        when 'lisp', 'cl', 'el', 'asd'
+          'lisp'
         when 'md', 'markdown'
           'markdown'
         when 'patch'
@@ -147,61 +149,27 @@ module Glimmer
       end
       
       def single_line_comment_prefix
-        # TODO redo this implementation using language instead of extension
-        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'
+        case language
+        when 'c', 'cpp', 'csharp', 'gradle', 'java', 'javascript', 'jsx', 'kotlin', 'rust', 'typescript', 'tsx', 'sass', 'scss'
           '//'
-        when 'cr',
-             'conf',
-             'coffee',
-             'ex', 'exs',
-             'feature',
-             'ini',
-             'pl',
-             'pp',
-             'properties',
-             'ps1',
-             'py',
-             'rb', 'rbw', 'rake', 'gemspec',
-             'sh',
-             'tcl',
-             'yaml', 'yml'
+        when 'crystal', 'conf', 'coffeescript', 'elixir', 'gherkin', 'ini', 'perl', 'puppet', 'properties', 'powershell', 'python', 'ruby', 'shell', 'tcl', 'yaml'
           '#'
         when 'css'
           '/*'
-        when 'eex', 'leex', 'heex',
-             'erb',
-             'html',
-             'jsp',
-             'plist',
-             'xml'
+        when 'eex', 'leex', 'heex', '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 'markdown'
           '<!---'
-        when 'ps'
+        when 'postscript'
           '%'
-        when 'scm', 'sps', 'sls', 'sld'
+        when 'lisp', 'scheme'
           ';'
         when 'sql'
           '--'
-        when 'json',
-             'patch',
-             'txt',
+        when 'json', 'diff', 'plaintext'
              nil
           nil
         else

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

@@ -187,6 +187,12 @@ module Glimmer
             elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_down)
               Command.do(file, :move_down!)
               key_event.doit = false
+            elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '='
+              bump_font_height_up
+            elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '-'
+              bump_font_height_down
+            elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '0'
+              restore_font_height
             end
           }
           on_verify_text { |verify_event|
@@ -205,6 +211,37 @@ module Glimmer
           }
         }
       end
+        
+      def bump_font_height_up
+        @original_font_height ||= font_datum.height
+        new_font_height = font_datum.height + 1
+        update_font_height(new_font_height)
+      end
+      
+      def bump_font_height_down
+        @original_font_height ||= font_datum.height
+        new_font_height = (font_datum.height - 1) == 0 ? font_datum.height : (font_datum.height - 1)
+        update_font_height(new_font_height)
+      end
+      
+      def restore_font_height
+        return if @original_font_height.nil?
+        update_font_height(@original_font_height)
+        @original_font_height = nil
+      end
+      
+      def update_font_height(new_font_height)
+        return if new_font_height.nil?
+        @text_proxy.font = {name: font_datum.name, height: new_font_height, style: font_datum.style}
+        @line_numbers_text&.font = {name: font_datum.name, height: new_font_height, style: font_datum.style}
+        @body_root.shell_proxy.layout(true, true)
+        @body_root.shell_proxy.pack_same_size
+      end
+      
+      def font_datum
+        @text_proxy.font.font_data.first
+      end
+      
       
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-15 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement