glimmer-cs-gladiator 0.8.2 → 0.9.3

data/bin/glimmer-cs-gladiator

@@ -1,22 +1,22 @@
-# Copyright (c) 2020-2021 Andy Maleh
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-require_relative '../lib/glimmer-cs-gladiator/launch'
+# Copyright (c) 2020-2022 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require_relative '../lib/glimmer-cs-gladiator/launch'

data/glimmer-cs-gladiator.gemspec

@@ -1,22 +1,21 @@
 # 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.8.2 ruby lib
+# stub: glimmer-cs-gladiator 0.9.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-cs-gladiator".freeze
-  s.version = "0.8.2"
+  s.version = "0.9.3"
 
   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-02-08"
+  s.date = "2022-01-29"
   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"
   ]
@@ -46,36 +45,30 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/AndyObtiva/glimmer-cs-gladiator".freeze
   s.licenses = ["MIT".freeze]
   s.post_install_message = "\nTo make the gladiator command available system-wide (especially with RVM), make sure you run this command with jruby in path: gladiator-setup\n\n".freeze
-  s.rubygems_version = "3.0.6".freeze
+  s.rubygems_version = "3.3.6".freeze
   s.summary = "Gladiator (Glimmer Editor) - Glimmer Custom Shell - Text Editor Built in Ruby".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.4.3", "< 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"])
-      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<simplecov>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<glimmer-dsl-swt>.freeze, [">= 4.18.4.3", "< 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"])
-      s.add_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
-      s.add_dependency(%q<warbler>.freeze, ["= 2.0.5"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    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.18.4.3", "< 5.0.0.0"])
+    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/glimmer-cs-gladiator/launch.rb

@@ -1,6 +1,27 @@
-require_relative '../glimmer-cs-gladiator'
-
-include Glimmer
-
-local_dir = ENV['LOCAL_DIR'] || '.'
-gladiator(project_dir_path: local_dir).open
+# Copyright (c) 2020-2022 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require_relative '../glimmer-cs-gladiator'
+
+include Glimmer
+
+local_dir = ENV['LOCAL_DIR'] || '.'
+gladiator(project_dir_path: local_dir).open

data/lib/glimmer-cs-gladiator.rb

@@ -1,30 +1,30 @@
-$LOAD_PATH.unshift(File.expand_path('..', __FILE__))
-
-require 'glimmer-dsl-swt'
-require 'filewatcher'
-require 'clipboard'
-require 'puts_debuggerer'
-require 'views/glimmer/gladiator'
-
-# Custom Composite Initializer (avoid default margins)
-Glimmer::SWT::WidgetProxy::DEFAULT_INITIALIZERS['composite'] = lambda do |composite|
-  if composite.get_layout.nil?
-    layout = GridLayout.new
-    composite.layout = layout
-  end
-end
-
-# Custom LayoutProxy initialize method (avoid default margins)
-module Glimmer
-  module SWT
-    class LayoutProxy
-      def initialize(underscored_layout_name, widget_proxy, args)
-        @underscored_layout_name = underscored_layout_name
-        @widget_proxy = widget_proxy
-        args = SWTProxy.constantify_args(args)
-        @swt_layout = self.class.swt_layout_class_for(underscored_layout_name).new(*args)
-        @widget_proxy.swt_widget.setLayout(@swt_layout)
-      end
-    end
-  end
-end
+$LOAD_PATH.unshift(File.expand_path('..', __FILE__))
+
+require 'glimmer-dsl-swt'
+require 'filewatcher'
+require 'clipboard'
+require 'puts_debuggerer'
+require 'views/glimmer/gladiator'
+
+# Custom Composite Initializer (avoid default margins)
+Glimmer::SWT::WidgetProxy::DEFAULT_INITIALIZERS['composite'] = lambda do |composite|
+  if composite.get_layout.nil?
+    layout = GridLayout.new
+    composite.layout = layout
+  end
+end
+
+# Custom LayoutProxy initialize method (avoid default margins)
+module Glimmer
+  module SWT
+    class LayoutProxy
+      def initialize(underscored_layout_name, widget_proxy, args)
+        @underscored_layout_name = underscored_layout_name
+        @widget_proxy = widget_proxy
+        args = SWTProxy.constantify_args(args)
+        @swt_layout = self.class.swt_layout_class_for(underscored_layout_name).new(*args)
+        @widget_proxy.swt_widget.setLayout(@swt_layout)
+      end
+    end
+  end
+end

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

@@ -1,3 +1,24 @@
+# Copyright (c) 2020-2022 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 module Glimmer
   class Gladiator
     class Command

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

@@ -1,3 +1,24 @@
+# Copyright (c) 2020-2022 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'models/glimmer/gladiator/file'
 
 module Glimmer
@@ -6,7 +27,7 @@ module Glimmer
       include Glimmer
       include Glimmer::DataBinding::ObservableModel
       
-      IGNORE_PATHS = ['.gladiator', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor', 'pkg', 'dist']
+      IGNORE_PATHS = ['.gladiator', '.gladiator-scratchpad', '.git', 'coverage', 'packages', 'node_modules', 'tmp', 'vendor', 'pkg', 'dist', 'log']
 
       attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :display_path, :ignore_paths
       attr_reader :name, :parent, :path
@@ -16,13 +37,13 @@ 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)
                 # TODO do fine grained file change only without a refresh delay for enhanced performance
                 begin
-                  if !@refresh_in_progress && !filename.include?('new_file') && (event != :updated || find_child_file(filename).nil?)
+                  if !@refresh_in_progress && !filename.include?('new_file') && !ignore_paths.any? { |ignore_path| filename.include?(ignore_path) } && (event != :updated || find_child_file(filename).nil?)
                     Thread.new {
                       refresh
                     }
@@ -109,6 +130,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 +211,8 @@ module Glimmer
         # scratchpad scenario
         if selected_path.empty? # Scratchpad
           @selected_child&.write_dirty_content
-          return (self.selected_child = File.new)
+          @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)
         return if ::Dir.exist?(full_selected_path) ||
@@ -188,7 +223,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
@@ -212,7 +246,7 @@ module Glimmer
         @selected_child.restore_properties(file_properties) if file_properties
       end
       
-      def delete!
+      def remove!
         FileUtils.rm_rf(path)
       end
   

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

@@ -1,3 +1,24 @@
+# Copyright (c) 2020-2022 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 module Glimmer
   class Gladiator
     class File
@@ -28,58 +49,81 @@ module Glimmer
         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/')
+        return 'make' if path.to_s.end_with?('Makefile') || path.to_s.end_with?('makefile') || path.to_s.end_with?('GNUmakefile')
         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'
+        when 'c', 'h'
           'c'
-        when 'hs'
-          'haskell'
-        when 'gradle'
-          'gradle'
-        when 'cpp'
+        when 'cr'
+          'crystal'
+        when 'cpp', 'cc', 'C', 'cxx', 'c++', 'hpp', 'hh', 'H', 'hxx', 'h++'
           'cpp'
         when 'css'
           'css'
-        when 'java'
-          'java'
-        when 'jsp'
-          'jsp'
-        when 'plist'
-          'plist'
+        when 'conf'
+          'conf'
+        when 'coffee'
+          'coffeescript'
+        when 'erb'
+          'erb'
+        when 'feature'
+          'gherkin'
+        when 'gradle'
+          'gradle'
         when 'haml'
           'haml'
-        when 'xml'
-          'xml'
+        when 'html'
+          'html'
         when 'ini'
           'ini'
+        when 'java'
+          'java'
+        when 'js', 'cjs', 'mjs', 'es6', 'es'
+          'javascript'
+        when 'json'
+          'json'
+        when 'jsp'
+          'jsp'
+        when 'kt', 'ktm', 'kts'
+          'kotlin'
+        when 'md', 'markdown'
+          'markdown'
+        when 'patch'
+          'diff'
         when 'pl'
           'perl'
-        when 'tcl'
-          'tcl'
+        when 'plist'
+          'plist'
+        when 'pp'
+          'puppet'
+        when 'properties'
+          'properties'
+        when 'ps'
+          'postscript'
+        when 'ps1'
+          'powershell'
+        when 'py'
+          'python'
+        when 'rb'
+          'ruby'
         when 'sass'
           'sass'
+        when 'scm', 'sps', 'sls', 'sld'
+          'scheme'
         when 'scss'
           'scss'
-        when 'sql'
-          'sql'
         when 'sh'
           'shell'
-        when 'vue'
-          'vue'
+        when 'sql'
+          'sql'
+        when 'tcl'
+          'tcl'
         when 'txt', nil
           'plain_text'
+        when 'yaml', 'yml'
+          'yaml'
+        when 'xml'
+          'xml'
         end
       end
       
@@ -121,8 +165,8 @@ module Glimmer
         unless (current_line_number && current_line_number == new_line_number)
           self.line_number = new_line_number
           # TODO check if the following line is needed
-          self.line_position = caret_position - caret_position_for_line_index(line_number - 1) + 1
         end
+        self.line_position = caret_position - caret_position_for_line_index(line_number - 1) + 1
       end
       
       def path=(the_path)
@@ -145,7 +189,13 @@ module Glimmer
       end
       
       def scratchpad?
-        path.to_s.empty?
+        path.to_s.empty? # TODO consider updating to set the .gladiator-scratchpad path directly
+      end
+      
+      def scratchpad_file
+        scratchpad_file = ::File.join(project_dir.path, '.gladiator-scratchpad')
+        ::File.write(scratchpad_file, content)
+        scratchpad_file
       end
 
       def backup_properties
@@ -221,20 +271,25 @@ module Glimmer
       end
       
       def close
+        @closed = true
         stop_filewatcher
         remove_all_observers
         initialize(path, project_dir)
         Command.clear(self)
       end
       
+      def closed?
+        @closed
+      end
+      
       def read_dirty_content
         path.empty? ? '' : ::File.read(path)
       end
 
       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
@@ -250,6 +305,10 @@ module Glimmer
 
       def stop_filewatcher
         @filewatcher&.stop
+        @filewatcher_thread&.kill
+        @filewatcher_thread = nil
+        @filewatcher&.finalize
+        @filewatcher = nil
       end
 
       def write_dirty_content
@@ -291,8 +350,8 @@ module Glimmer
         lines[line_number - 1]
       end
 
-      def delete!
-        FileUtils.rm(path) unless scratchpad?
+      def remove!
+        FileUtils.rm_rf(path) unless scratchpad?
       end
 
       def prefix_new_line!
@@ -508,16 +567,17 @@ 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
-        self.selection_count = 0
         self.line_number = [(self.line_number - 15), 1].max
+        self.selection_count = 0
       end
 
       def page_down
-        self.selection_count = 0
         self.line_number = [(self.line_number + 15), lines.size].min
+        self.selection_count = 0
       end
 
       def home
@@ -551,6 +611,7 @@ module Glimmer
         self.selection_count = (caret_position_for_line_index(self.line_number) - 1) - caret_position
       end
 
+      # deletes content that is highlighted
       def delete!
         new_dirty_content = dirty_content
         new_dirty_content[caret_position...(caret_position + selection_count)] = ''
@@ -627,13 +688,13 @@ module Glimmer
       
       def run
         if scratchpad?
-          TOPLEVEL_BINDING.receiver.send(:eval, content)
+          load scratchpad_file
         else
           write_dirty_content
           load path
         end
       end
-
+      
       def lines
         need_padding = dirty_content.to_s.end_with?("\n")
         splittable_content = need_padding ? "#{dirty_content} " : dirty_content

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

@@ -1,3 +1,24 @@
+# Copyright (c) 2020-2022 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 module Glimmer
   class Gladiator
     class FileEditMenu