glimmer-cs-gladiator 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 650c712355cabdc815732a44b445b14ba7940daf39905019f10b7cdf1c62a935
-  data.tar.gz: 02377cc0cc8891d0ff3128877ee521c0ae6674c86304b0663ce3956e603e3cd1
+  metadata.gz: 1b17d21c81f04c1f1fc1ad516013d9e62a6abeb0900096b1bd13c95c6cf10ccd
+  data.tar.gz: 78d41ab949f3f40c71f2abfa26310a32f3720eecb64dcf5b90d2f155c2b35345
 SHA512:
-  metadata.gz: fcefebd0897944ec7e6634027c9e44cce3f705001a452d21ad68647b6e5aec70652c0d6cc7d8dfdd4870ddda6995902625eebc91bf085e7b5fbfe5db35c1b479
-  data.tar.gz: 4604954cce35346ddb5203f76e45efc492b37421b3f4748be5bbd7b7c34208efb4bb5de92445391f7a537b25aaa74747ffca9fa698139eb11f0a3549e37ede6b
+  metadata.gz: bff6362c1eb4cc711c507ac90aa34e5a5b11653fe7b48f475bd829b37fdb1a87ca6b2317b35ff11f14f287aebfe2e35dee5e47ea2e9575f74c7b9971a1231b77
+  data.tar.gz: dc19f782cfb448e32f8054fee66797001af383cdcbedf26aeed3a3beaddef4309edefa4ca59c9be4192cd534d8a670bed35bd691ee458e3c5d22a43938e9d5e2

data/README.md

@@ -1,10 +1,12 @@
-# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.3.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.4.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)
 
 ![Gladiator](images/glimmer-gladiator.png)
 
-Gladiator (short for Glimmer Editor) is a [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) sample project under on-going development that demonstrates how to build a text editor in [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) (JRuby Desktop Development GUI Library).
+(Now, slightly less ugly with Ruby syntax highlighting colors)
+
+Gladiator (short for Glimmer Editor) is a [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer-dsl-swt) sample 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.
@@ -12,6 +14,7 @@ I leave building truly professional text editors to software tooling experts who
 ## Features
 
 Gladiator currently supports the following text editing features (including keyboard shortcuts with Mac CMD=CTRL on Windows/Linux):
+- Ruby Syntax Highlighting with colors
 - 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,6 +33,8 @@ Gladiator currently supports the following text editing features (including keyb
 - 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 current Ruby file via Run Menu (CMD+SHIFT+R)
+- Change Split Orientation to Horizontal/Vertical via View Menu (CMD+SHIFT+O)
 
 ## Platforms
 
@@ -99,7 +104,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '~> 0.3.1'
+gem 'glimmer-cs-gladiator', '~> 0.4.0'
 ```
 
 Run:

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

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

@@ -1,7 +1,9 @@
 module Glimmer
   class Gladiator
-    class Command
+    class Command    
       class << self
+        include Glimmer
+        
         def command_history
           @command_history ||= {}
         end
@@ -11,7 +13,7 @@ module Glimmer
           command_history[file] ||= [Command.new(file)] 
         end
         
-        def do(file, method = nil, command: nil)
+        def do(file, method = nil, command: nil)        
           command ||= Command.new(file, method)
           command_history_for(file)&.last&.next_command = command
           command.do
@@ -20,11 +22,13 @@ module Glimmer
         
         def undo(file)
           return if command_history_for(file).size <= 1        
-          command_history_for(file).pop.undo
+          command = command_history_for(file).pop
+          command&.undo
         end
         
         def redo(file)
-          command_history_for(file).last&.redo
+          command = command_history_for(file).last
+          command&.redo
         end
       end
     

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

@@ -5,15 +5,15 @@ module Glimmer
     class File
       include Glimmer
   
-      attr_accessor :dirty_content, :line_numbers_content, :selection, :selection_count, :line_number, :find_text, :replace_text, :top_index, :display_path, :case_sensitive
+      attr_accessor :dirty_content, :line_numbers_content, :selection, :line_number, :find_text, :replace_text, :top_pixel, :display_path, :case_sensitive
       attr_reader :name, :path
-  
+
       def initialize(path)
         raise "Not a file path: #{path}" unless ::File.file?(path)
         @command_history = []
         @name = ::File.basename(path)
         self.path = ::File.expand_path(path)
-        @top_index = 0
+        @top_pixel = 0
         @selection_count = 0
         @selection = Point.new(0, 0 + @selection_count)
         read_dirty_content = ::File.read(path)
@@ -52,8 +52,11 @@ module Glimmer
       
       # to use for widget data-binding
       def content=(value)
-        Command.do(self) # record a native (OS-widget) operation
-        self.dirty_content = value
+        value = value.gsub("\t", '  ')
+        if dirty_content != value
+          Command.do(self) # record a native (OS-widget) operation
+          self.dirty_content = value
+        end
       end
 
       def content
@@ -61,18 +64,23 @@ module Glimmer
       end
 
       def caret_position=(value)
+        old_top_pixel = top_pixel
         self.selection = Point.new(value, value + selection_count.to_i)
-        if OS.linux?
-          async_exec do
-            self.top_index = line_index_for_caret_position(value)
-          end
-        end
+        self.top_pixel = old_top_pixel
       end
       
       def caret_position
         selection.x
       end
+
+      def selection_count
+        selection.y - selection.x
+      end
       
+      def selection_count=(value)
+        self.selection = Point.new(caret_position, caret_position + value.to_i)
+      end      
+                  
       def name=(the_name)
         new_path = path.sub(/#{Regexp.escape(@name)}$/, the_name)
         @name = the_name
@@ -135,10 +143,10 @@ module Glimmer
         current_line.to_s.match(/^(\s+)/).to_a[1].to_s
       end
 
-      def current_line
+      def current_line      
         lines[line_number - 1]
       end
-      
+
       def delete!
         FileUtils.rm(path)        
       end
@@ -210,8 +218,9 @@ module Glimmer
         old_caret_position = self.caret_position
         self.dirty_content = new_lines.join("\n")   
         if old_selection_count.to_i > 0
-          self.caret_position = caret_position_for_line_index(old_caret_position_line_index)
-          self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
+          caret_position_value = caret_position_for_line_index(old_caret_position_line_index)
+          selection_count_value = (caret_position_for_line_index(old_end_caret_line_index + 1) - caret_position_value)
+          self.selection = Point.new(caret_position_value, caret_position_value + selection_count_value)
         else
           self.caret_position = old_caret_position + delta
         end
@@ -239,8 +248,9 @@ module Glimmer
         end
         self.dirty_content = new_lines.join("\n")   
         if old_selection_count.to_i > 0
-          self.caret_position = caret_position_for_line_index(old_caret_position_line_index)
-          self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position)
+          caret_position_value = caret_position_for_line_index(old_caret_position_line_index)
+          selection_count_value = (caret_position_for_line_index(old_end_caret_line_index + 1) - caret_position_value)
+          self.selection = Point.new(caret_position_value, caret_position_value + selection_count_value)
         else
           new_caret_position = old_caret_position + delta
           new_caret_position = [new_caret_position, old_caret_position_line_caret_position].max
@@ -290,7 +300,7 @@ module Glimmer
         all_lines = lines
         the_line_index = line_index_for_caret_position(caret_position)
         line_position = line_position_for_caret_position(caret_position)
-        found = 
+        found = found_text?(caret_position)
         2.times do |i|
           rotation = the_line_index
           all_lines.rotate(rotation).each_with_index do |the_line, the_index|
@@ -302,6 +312,7 @@ module Glimmer
             if occurrence_index
               self.caret_position = caret_position_for_line_index(the_index) + start_position + occurrence_index
               self.selection_count = find_text.to_s.size
+              self.selection = Point.new(self.caret_position, self.caret_position + self.selection_count)
               return
             end
           end

data/lib/views/glimmer/gladiator.rb

@@ -15,6 +15,7 @@ module Glimmer
   class Gladiator
     include Glimmer::UI::CustomShell
     
+    APP_ROOT = ::File.expand_path('../../../..', __FILE__)  
     COMMAND_KEY = OS.mac? ? :command : :ctrl
 
     class << self
@@ -28,6 +29,8 @@ module Glimmer
     # option :width, 320
     # option :height, 240
     
+    attr_accessor :split_orientation
+    
     ## Uncomment before_body block to pre-initialize variables to use in body
     #
     #
@@ -72,6 +75,8 @@ module Glimmer
                 @text_editor&.text_widget&.setFocus
               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)
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == ']'
             @tab_folder.swt_widget.setSelection((@tab_folder.swt_widget.getSelectionIndex() + 1) % @tab_folder.swt_widget.getItemCount) if @tab_folder.swt_widget.getItemCount > 0
             @text_editor&.text_widget&.setFocus
@@ -132,10 +137,10 @@ module Glimmer
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 'l'
             @line_number_text.swt_widget.selectAll
             @line_number_text.swt_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 'r'
+          elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'r'
             @filter_text.swt_widget.selectAll
             @filter_text.swt_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 't'
+          elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 't'
             select_tree_item unless @rename_in_progress
             @tree.swt_widget.setFocus
           elsif key_event.keyCode == swt(:esc)
@@ -147,6 +152,7 @@ module Glimmer
         }
       }
 
+      @split_orientation = swt(:horizontal)
       local_dir = ENV['LOCAL_DIR'] || '.'
       @config_file_path = ::File.join(local_dir, '.gladiator')
       @config = {}
@@ -223,7 +229,7 @@ module Glimmer
       observe(Dir.local_dir, 'selected_child.caret_position') do
         save_config
       end
-      observe(Dir.local_dir, 'selected_child.top_index') do
+      observe(Dir.local_dir, 'selected_child.top_pixel') do
         save_config
       end
       load_config
@@ -258,6 +264,46 @@ module Glimmer
         on_shell_deactivated {
           @text_editor&.file&.write_dirty_content
         }        
+
+        menu_bar {
+          menu {
+            text '&View'
+            menu {
+              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)})
+              }
+              menu_item(:radio) {
+                text '&Vertical'
+                selection bind(self, :split_orientation, on_read: ->(o) { o == swt(:vertical)}, on_write: ->(b) { b ? swt(:vertical) : swt(:horizontal)})
+              }
+            }
+          }
+          menu {
+            text '&Run'
+#             menu_item {
+#               text 'Launch Glimmer &App'
+#               on_widget_selected {
+#                 parent_path = Dir.local_dir.path
+##                 current_directory_name = ::File.basename(parent_path)
+##                 assumed_shell_script = ::File.join(parent_path, 'bin', current_directory_name)      
+##                 assumed_shell_script = ::Dir.glob(::File.join(parent_path, 'bin', '*')).detect {|f| ::File.file?(f) && !::File.read(f).include?('#!/usr/bin/env')} if !::File.exist?(assumed_shell_script)
+##                 load assumed_shell_script
+#                 FileUtils.cd(parent_path) do
+#                   system 'glimmer run'
+#                 end
+#               }
+#             }
+            menu_item {
+              text '&Current File'
+              on_widget_selected {
+                load Dir.local_dir.selected_child.path
+              }
+            }
+          }
+        }
+
         composite {
           grid_layout 1, false
           layout_data(:fill, :fill, false, true) {
@@ -395,9 +441,13 @@ module Glimmer
             
             # row 1
             
+            label {
+              text 'File:'
+            }
+
             @file_path_label = styled_text(:none) {
               layout_data(:fill, :fill, true, false) {
-                horizontal_span 3
+                horizontal_span 2
               }
               background color(:widget_background)
               editable false
@@ -496,6 +546,7 @@ module Glimmer
               height_hint 480
             }
             sash_width 10
+            orientation bind(self, :split_orientation)
             @tab_folder = tab_folder {
               drag_source(DND::DROP_COPY) {
                 transfer [TextTransfer.getInstance].to_java(Transfer)
@@ -549,7 +600,7 @@ module Glimmer
         Gladiator.drag = false
         Dir.local_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path]
         Dir.local_dir.selected_child&.caret_position  = Dir.local_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
-        Dir.local_dir.selected_child&.top_index = @config[:top_index].to_i if @config[:top_index]
+        Dir.local_dir.selected_child&.top_pixel = @config[:top_pixel].to_i if @config[:top_pixel]
       else
         @loaded_config = true
       end
@@ -561,12 +612,12 @@ module Glimmer
       return if child.nil?
       tab_folder1 = @tab_folder1 || @tab_folder
       tab_folder2 = @tab_folder2
-      open_file_paths1 = tab_folder1&.swt_widget&.items&.to_a.map {|i| i.get_data('file_path')}
-      open_file_paths2 = tab_folder2&.swt_widget&.items&.to_a.map {|i| i.get_data('file_path')}
+      open_file_paths1 = tab_folder1&.swt_widget&.items.to_a.map {|i| i.get_data('file_path')}
+      open_file_paths2 = tab_folder2&.swt_widget&.items.to_a.map {|i| i.get_data('file_path')}
       @config = {
         selected_child_path: child.path,
         caret_position: child.caret_position,
-        top_index: child.top_index,
+        top_pixel: child.top_pixel,
         shell_width: swt_widget&.getBounds&.width,
         shell_height: swt_widget&.getBounds&.height,
         shell_x: swt_widget&.getBounds&.x,

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

@@ -16,13 +16,13 @@ module Glimmer
         composite {
           layout_data :fill, :fill, true, true
           grid_layout 2, false
-          @line_numbers_text = text(:multi) {
+          @line_numbers_text = code_text(:border, :multi) {
             layout_data(:right, :fill, false, true)
             font name: 'Consolas', height: OS.mac? ? 15 : 12
             background color(:widget_background)
             foreground rgb(75, 75, 75)
             text bind(file, 'line_numbers_content')
-            top_index bind(file, 'top_index', read_only: true)
+            top_pixel bind(file, 'top_pixel', read_only: true)
             on_focus_gained {
               @text&.swt_widget.setFocus
             }
@@ -33,15 +33,15 @@ module Glimmer
               @text&.swt_widget.setFocus
             }
           }
-          @text = text(:multi, :border, :h_scroll, :v_scroll) {
+          
+          @text = code_text {
             layout_data :fill, :fill, true, true
             font name: 'Consolas', height: OS.mac? ? 15 : 12
             foreground rgb(75, 75, 75)
             text bind(file, :content)
             focus true
-            selection bind(file, 'selection')
-            selection_count bind(file, 'selection_count')
-            top_index bind(file, 'top_index')
+            selection bind(file, :selection)
+            top_pixel bind(file, :top_pixel)
             drop_target(DND::DROP_COPY) {
               transfer [TextTransfer.getInstance].to_java(Transfer)
               on_drag_enter { |event|
@@ -57,12 +57,21 @@ module Glimmer
             
             on_focus_lost {
               file&.write_dirty_content
-            }
-      	     on_key_pressed { |key_event|
+            }              
+            on_verify_key { |key_event|
               if (Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'z') || (key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'y')                
                 key_event.doit = !Command.redo(file)
+              elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'r'
+                Dir.local_dir.selected_child.write_dirty_content              
+                begin
+                  load Dir.local_dir.selected_child.path
+                rescue => e
+                  puts e.full_message
+                end
               elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'z'
                 key_event.doit = !Command.undo(file)
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'a'
+                key_event.widget.selectAll
               elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '/'
                 Command.do(file, :comment_line!)
                 key_event.doit = false
@@ -105,13 +114,13 @@ module Glimmer
               end
             }
             on_verify_text { |verify_event|
-              key_code = verify_event.keyCode
-              case key_code
-              when swt(:cr)
+              # TODO convert these into File commands to support Undo/Redo                             
+              case verify_event.text
+              when "\n"
                 if file.selection_count.to_i == 0
                   verify_event.text += file.current_line_indentation
                 end
-              when swt(:tab)
+              when "\t"
                 if file.selection_count.to_i > 0
                   Command.do(file, :indent!)
                   verify_event.doit = false

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.17.2.0
+        version: 4.17.4.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.17.2.0
+        version: 4.17.4.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0.0