glimmer-cs-gladiator 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10060190546fe60cbf5c1e130191ed12ff17ea7deee820fd9294ad59b04b8dfa
-  data.tar.gz: f6ad081752171216f5980a1a5d9508d1c433ed9cd35cdcb5c2f5c022254376c8
+  metadata.gz: 8d758e5b444ef3d48c0214ffb763e3dab3f9ca9748961e879b9ebdb626e9c2ea
+  data.tar.gz: cb575fbe30017319190278483334256aeb04d277798a5e3351f944c3d3a61481
 SHA512:
-  metadata.gz: '092bcecbbcc5fa79cbc4e085546f3b37760e429369498fb24508cffacef919c0e89d1d84c3faa75fe9a38a35bfbae0fb280a273aa6d0b479134b1724145e7f6d'
-  data.tar.gz: 50893f0dc416e754ca5e589cc82164cb6214c3b56090759bb085e4a8c61cf96c4423002a986740b923c0ffc6861eb8706fa3d44fefe7d1ca298cd179c835e242
+  metadata.gz: 4223591b0608f621432a7ee1a1f710ad4a1684aaafb6d1d9152f064b8d707216ba3dc5fece5836764db058a9a88d209d161ee8abc5062d4fb9a4a821cb986c61
+  data.tar.gz: 3296674924ae085c139919e9e22a32d1c5a322b163b7fc6954e89bc02af4cb2a7c80e9a49359d9d136f4113206c48ebfcedbbe917e3f97e35529575abed1832a

data/README.md

@@ -1,4 +1,4 @@
-# Gladiator (Glimmer Editor) 0.1.1 - Glimmer Custom Shell
+# Gladiator (Glimmer Editor) 0.1.6 - Glimmer Custom Shell
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
 ![Gladiator](images/glimmer-gladiator.png)
@@ -9,18 +9,29 @@ 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.
 
 Gladiator currently supports the following text editing features:
-- File explorer navigation to open file
-- File lookup by name
-- Find & Replace
+- File explorer navigation 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
+- Watch project subdirectories for changes to automatically refresh in file explorer/file lookup
+- Find & Replace (CMD+F)
 - Show Line Numbers
-- Jump to Line
-- Remember last opened file, caret position, and top line
-- Autosave on focus out/quit/open new file
-- Watch open file for external changes to reflect in editor
-- Duplicate Line(s)
-- Kill Line(s)
-- Move up one line
-- Move down one line
+- Jump to Line (CMD+L)
+- Multiple tab support (CMD+SHIFT+[ & CMD+SHIFT+] for tab navigation. CMD+1-9 to jump to a specific tab)
+- Remember opened tabs, caret position, top line, window size, and window location
+- Autosave on focus out/quit/open new file 
+- Duplicate Line(s)/selection (CMD+D)
+- Kill Line(s)/selection (CMD+K)
+- Move line/selection up (CMD+UP)
+- Move line/selection down (CMD+DOWN)
+- Comment/Uncomment line/selection (CMD+/)
+- Indent/Unindent line/selection (CMD+] & CMD+[)
+- Insert/Prefix New Line (CMD+ENTER & CMD+SHIFT+ENTER)
+
+## Platforms
+
+- Mac: Gladiator works best on the Mac.
+- Linux: Gladiator works with handicaps on Linux (performing text editing operations causes scroll jitter)
+- Windows: Not tested on Windows yet, but should theoretically work there too.
 
 ## Pre-requisites
 
@@ -49,7 +60,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '0.1.1'
+gem 'glimmer-cs-gladiator', '0.1.6'
 ```
 
 Run:

data/bin/gladiator

@@ -3,4 +3,11 @@
 require 'glimmer/launcher'
 
 gladiator_runner = File.expand_path('../gladiator_runner.rb', __FILE__)
-Glimmer::Launcher.new([gladiator_runner, '-J-Xrs'] + ARGV).launch
+launcher = Glimmer::Launcher.new([gladiator_runner, '-J-Xrs'] + ARGV)
+launcher.application_paths.to_a.each do |file|
+  if file != gladiator_runner
+    launcher.application_paths.delete(file)
+    ENV['LOCAL_DIR'] ||= file
+  end
+end
+launcher.launch

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

@@ -15,41 +15,66 @@ module Glimmer
             @thread = Thread.new(@filewatcher) do |fw| 
               fw.watch do |filename, event|
                 if @last_update.nil? || (Time.now.to_f - @last_update) > REFRESH_DELAY
-                  dir.refresh if filename != dir.selected_child_path
+                  dir.refresh if !filename.include?('new_file') && !dir.selected_child_path_history.include?(filename) && filename != dir.selected_child_path
                 end
                 @last_update = Time.now.to_f
               end
             end
           end
-        end
+        end        
       end
   
-      attr_accessor :selected_child, :filter, :children, :filtered_path_options
-      attr_reader :path, :display_path
+      attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :path, :display_path
+      attr_reader :name, :parent
+      attr_writer :all_children, :children
   
       def initialize(path)
-        @path = @display_path = path
+        @display_path = path
+        @path = ::File.expand_path(@display_path)
+        @name = ::File.basename(::File.expand_path(path))
         self.filtered_path_options = []
       end
+
+      def name=(the_name)
+        self.display_path = display_path.sub(/#{Regexp.escape(@name)}$/, the_name)
+        @name = the_name
+        new_path = ::File.expand_path(display_path)
+        FileUtils.mv(path, new_path)
+        self.path = display_path
+      end
   
       def children
         @children ||= retrieve_children
       end
-  
+
       def retrieve_children
-        ::Dir.glob(::File.join(@path, '*')).map {|p| ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)}.sort_by {|c| c.path.to_s.downcase }.sort_by {|c| c.class.name }
+        ::Dir.glob(::File.join(@display_path, '*')).map {|p| ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)}.sort_by {|c| c.path.to_s.downcase }.sort_by {|c| c.class.name }
       end
   
-      def refresh
+      def selected_child_path_history
+        @selected_child_path_history ||= []
+      end
+  
+      def pause_refresh
+        @refresh_paused = true
+      end
+      
+      def resume_refresh
+        @refresh_paused = false
+      end
+
+      def refresh(async: true, force: false)
+        return if @refresh_paused && !force
         new_all_children = retrieve_all_children
-        new_children = retrieve_children
-        async_exec do
-          @all_children = new_all_children
-          @children ||= []
-          @children.clear
-          new_children.each do |child|
-            @children << child
-          end
+        new_children = retrieve_children        
+        refresh_operation = lambda do
+          self.all_children = new_all_children
+          self.children = new_children
+        end
+        if async
+          async_exec(&refresh_operation)
+        else
+          sync_exec(&refresh_operation)
         end
       end
   
@@ -66,7 +91,7 @@ module Glimmer
         return if filter.nil?
         all_children_files.select do |child| 
           child.path.downcase.include?(filter.downcase) ||
-            child.path.downcase.gsub(/[_\/]/, '').include?(filter.downcase)
+            child.path.downcase.gsub(/[_\/\.]/, '').include?(filter.downcase)
         end.sort_by {|c| c.path.to_s.downcase}
       end
   
@@ -75,7 +100,7 @@ module Glimmer
       end
   
       def retrieve_all_children
-        ::Dir.glob(::File.join(@path, '**', '*')).map {|p| ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)}
+        ::Dir.glob(::File.join(@display_path, '**', '*')).map {|p| ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)}
       end
   
       def all_children_files
@@ -83,31 +108,46 @@ module Glimmer
       end
   
       def selected_child_path=(selected_path)
-        if selected_path && ::File.file?(selected_path)
+        return if selected_path.nil? || 
+                  ::Dir.exist?(selected_path) || 
+                  (selected_child && ::File.expand_path(selected_child.path) == ::File.expand_path(selected_path))
+        if ::File.file?(selected_path)
           @selected_child&.write_dirty_content
           new_child = Gladiator::File.new(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
             end
           rescue
             # no op
           end
+        else
+          refresh
         end
       end
       
       def selected_child_path
         @selected_child&.path
       end
-  
-      alias filtered_path selected_child_path
-      alias filtered_path= selected_child_path=
+      
+      def delete!
+        FileUtils.rm_rf(path)
+      end
   
       def to_s
         path
       end
+      
+      def eql?(other)
+        self.path.eql?(other&.path)
+      end
+      
+      def hash
+        self.path.hash
+      end
     end  
   end
 end

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

@@ -5,13 +5,17 @@ module Glimmer
     class File
       include Glimmer
   
-      attr_accessor :dirty_content, :line_numbers_content, :caret_position, :selection_count, :line_number, :find_text, :replace_text, :top_index
-      attr_reader :path, :display_path
+      attr_accessor :line_numbers_content, :selection, :selection_count, :line_number, :find_text, :replace_text, :top_index, :path, :display_path
+      attr_reader :name, :dirty_content
   
       def initialize(path)
         raise "Not a file path: #{path}" unless ::File.file?(path)
         @display_path = path
+        @name = ::File.basename(path)
         @path = ::File.expand_path(path)
+        @top_index = 0
+        @selection_count = 0
+        @selection = Point.new(0, 0 + @selection_count)
         read_dirty_content = ::File.read(path)
         begin
           # test read dirty content
@@ -20,20 +24,47 @@ module Glimmer
             lines_text_size = lines.size.to_s.size
             self.line_numbers_content = lines.size.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n")
           end
+          @line_number = 1
           self.dirty_content = read_dirty_content
-          observe(self, :caret_position) do
+          observe(self, :selection) do
             self.line_number = line_index_for_caret_position(caret_position) + 1
           end
           observe(self, :line_number) do
             if line_number
-              new_caret_position = lines[0...(line_number.to_i - 1)].map(&:size).sum + line_number.to_i - 1
-              self.caret_position = new_caret_position unless line_index_for_caret_position(new_caret_position) == line_index_for_caret_position(caret_position)
+              line_index = line_number - 1
+              new_caret_position = caret_position_for_line_index(line_index)
+              self.caret_position = new_caret_position unless self.caret_position && line_index_for_caret_position(new_caret_position) == line_index_for_caret_position(caret_position)
             end
           end
         rescue
           # no op in case of a binary file
         end
       end
+
+      def caret_position=(value)
+        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
+      end
+      
+      def caret_position
+        selection.x
+      end
+      
+      def name=(the_name)
+        self.display_path = display_path.sub(/#{Regexp.escape(@name)}$/, the_name)
+        @name = the_name
+        new_path = ::File.expand_path(display_path)
+        FileUtils.mv(path, new_path)
+        self.path = new_path
+      end
+      
+      def dirty_content=(the_content)
+        @dirty_content = the_content if ::File.exist?(path)
+      end
   
       def start_filewatcher
         @filewatcher = Filewatcher.new(@path)
@@ -56,23 +87,55 @@ module Glimmer
       def stop_filewatcher
         @filewatcher&.stop
       end
-  
-      def write_dirty_content
+
+      def format_dirty_content_for_writing!
         new_dirty_content = "#{dirty_content.gsub("\r\n", "\n").gsub("\r", "\n").sub(/\n+\z/, '')}\n"      
         self.dirty_content = new_dirty_content if new_dirty_content != self.dirty_content
-        ::File.write(path, dirty_content) if ::File.exists?(path) && dirty_content.to_s.strip.size > 0
+      end
+  
+      def write_dirty_content
+        return unless ::File.exist?(path)
+        format_dirty_content_for_writing!
+        ::File.write(path, dirty_content) if ::File.exists?(path)
       rescue => e
         puts "Error in writing dirty content for #{path}"
         puts e.full_message
       end
   
       def write_raw_dirty_content
-        ::File.write(path, dirty_content) if ::File.exists?(path) && dirty_content.to_s.strip.size > 0
+        return unless ::File.exist?(path)
+        ::File.write(path, dirty_content) if ::File.exists?(path)
       rescue => e
         puts "Error in writing raw dirty content for #{path}"
         puts e.full_message
       end
-  
+
+      def current_line_indentation
+        current_line.to_s.match(/^(\s+)/).to_a[1].to_s
+      end
+
+      def current_line
+        lines[line_number - 1]
+      end
+      
+      def delete!
+        FileUtils.rm(path)        
+      end
+      
+      def prefix_new_line!
+        the_lines = lines
+        the_lines[line_number-1...line_number-1] = [current_line_indentation]
+        self.dirty_content = the_lines.join("\n")
+        self.caret_position = caret_position_for_line_index(line_number-1) + current_line_indentation.size
+      end
+
+      def insert_new_line!
+        the_lines = lines
+        the_lines[line_number...line_number] = [current_line_indentation]
+        self.dirty_content = the_lines.join("\n")
+        self.caret_position = caret_position_for_line_index(line_number) + current_line_indentation.size
+      end
+
       def comment_line!
         old_lines = lines
         return if old_lines.size < 1
@@ -98,7 +161,7 @@ module Glimmer
           end
         end
         self.dirty_content = new_lines.join("\n")   
-        if old_selection_count > 0
+        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)
         else
@@ -124,7 +187,7 @@ module Glimmer
         end
         old_caret_position = self.caret_position
         self.dirty_content = new_lines.join("\n")   
-        if old_selection_count > 0
+        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)
         else
@@ -144,7 +207,7 @@ module Glimmer
         delta = 0
         line_indices_for_selection(caret_position, selection_count).each do |the_line_index|
           the_line = old_lines[the_line_index]
-          if the_line.start_with?('  ')
+          if the_line.to_s.start_with?('  ')
             new_lines[the_line_index] = the_line.sub(/  /, '')
             delta = -2
           elsif the_line.start_with?(' ')
@@ -153,7 +216,7 @@ module Glimmer
           end
         end
         self.dirty_content = new_lines.join("\n")   
-        if old_selection_count > 0
+        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)
         else
@@ -165,12 +228,15 @@ module Glimmer
   
       def kill_line!
         new_lines = lines
-        return if new_lines.size < 2
+        return if new_lines.size < 1
         line_indices = line_indices_for_selection(caret_position, selection_count)
         new_lines = new_lines[0...line_indices.first] + new_lines[(line_indices.last+1)...new_lines.size]
         old_caret_position = self.caret_position
-        self.dirty_content = new_lines.join("\n")
-        self.caret_position = old_caret_position
+        old_line_index = self.line_number - 1
+        line_position = line_position_for_caret_position(old_caret_position)
+        self.dirty_content = "#{new_lines.join("\n")}\n"
+        self.caret_position = caret_position_for_line_index(old_line_index) + [line_position, lines[old_line_index].to_s.size].min
+        self.selection_count = 0
       end
   
       def duplicate_line!
@@ -189,7 +255,7 @@ module Glimmer
           new_lines.insert(the_line_indices.first + i, the_line)
         end
         self.dirty_content = new_lines.join("\n")
-        if old_selection_count > 0
+        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)
         else
@@ -201,12 +267,21 @@ module Glimmer
         return if find_text.to_s.empty?
         all_lines = lines
         the_line_index = line_index_for_caret_position(caret_position)
-        all_lines.rotate(the_line_index + 1).each_with_index do |the_line, the_index|
-          the_index = (the_index + the_line_index + 1)%all_lines.size
-          if the_line.downcase.include?(find_text.to_s.downcase)
-            self.caret_position = the_line.downcase.index(find_text.to_s.downcase) + caret_position_for_line_index(the_index)
-            self.selection_count = find_text.to_s.size
-            return
+        line_position = line_position_for_caret_position(caret_position)
+        found = 
+        2.times do |i|
+          rotation = the_line_index
+          all_lines.rotate(rotation).each_with_index do |the_line, the_index|
+            the_index = (the_index + rotation)%all_lines.size
+            start_position = 0
+            start_position = line_position + find_text.to_s.size if i == 0 && the_index == the_line_index && found_text?(caret_position)
+            text_to_find_in = the_line.downcase[start_position..-1]
+            occurrence_index = text_to_find_in&.index(find_text.to_s.downcase)
+            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
+              return
+            end
           end
         end
       end
@@ -215,21 +290,34 @@ module Glimmer
         return if find_text.to_s.empty?
         all_lines = lines
         the_line_index = line_index_for_caret_position(caret_position)
-        all_lines.rotate(the_line_index).each_with_index.map do |the_line, the_index|
-          the_index = (the_index + the_line_index)%all_lines.size
-          [the_line, the_index]
-        end.reverse.each do |the_line, the_index|
-          if the_line.downcase.include?(find_text.to_s.downcase)
-            self.caret_position = the_line.downcase.index(find_text.to_s.downcase) + caret_position_for_line_index(the_index)
-            self.selection_count = find_text.to_s.size
-            return
+        line_position = line_position_for_caret_position(caret_position)
+        2.times do |i|
+          rotation = - the_line_index - 1 + all_lines.size
+          all_lines.reverse.rotate(rotation).each_with_index do |the_line, the_index|
+            the_index = all_lines.size - 1 - (the_index + rotation)%all_lines.size
+            if the_index == the_line_index
+              start_position = i > 0 ? 0 : (the_line.size - line_position)
+            else
+              start_position = 0
+            end
+            text_to_find_in = the_line.downcase.reverse[start_position...the_line.size].to_s
+            occurrence_index = text_to_find_in.index(find_text.to_s.downcase.reverse)
+            if occurrence_index
+              self.caret_position = caret_position_for_line_index(the_index) + (the_line.size - (start_position + occurrence_index + find_text.to_s.size))
+              self.selection_count = find_text.to_s.size
+              return
+            end
           end
         end
       end
   
       def ensure_find_next
         return if find_text.to_s.empty? || dirty_content.to_s.strip.size < 1
-        find_next unless dirty_content[caret_position.to_i, find_text.to_s.size] == find_text
+        find_next unless found_text?(self.caret_position)
+      end
+
+      def found_text?(caret_position)
+        dirty_content[caret_position.to_i, find_text.to_s.size].to_s.downcase == find_text.to_s.downcase
       end
   
       def replace_next!
@@ -242,10 +330,12 @@ module Glimmer
       end
   
       def page_up
+        self.selection_count = 0
         self.line_number = [(self.line_number - 15), 1].max
       end
   
       def page_down
+        self.selection_count = 0
         self.line_number = [(self.line_number + 15), lines.size].min
       end
   
@@ -262,23 +352,18 @@ module Glimmer
         return if old_lines.size < 2
         old_selection_count = self.selection_count
         old_caret_position = self.caret_position
-        old_caret_position_line_index = line_index_for_caret_position(old_caret_position)
-        old_caret_position_line_caret_position = caret_position_for_caret_position_start_of_line(old_caret_position_line_index)
+        old_caret_position_line_caret_position = caret_position_for_caret_position_start_of_line(old_caret_position)
+        old_caret_position_line_position = old_caret_position - old_caret_position_line_caret_position
         old_end_caret_line_index = end_caret_position_line_index(caret_position, selection_count)
         new_lines = lines
         the_line_indices = line_indices_for_selection(caret_position, selection_count)
         the_lines = lines_for_selection(caret_position, selection_count)
         new_line_index = [the_line_indices.first - 1, 0].max
-        delta = -1 * (new_lines[new_line_index].size + 1)
         new_lines[the_line_indices.first..the_line_indices.last] = []
         new_lines[new_line_index...new_line_index] = the_lines
         self.dirty_content = new_lines.join("\n")
-        if old_selection_count > 0
-          self.caret_position = caret_position_for_line_index(old_caret_position_line_index) + delta
-          self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position + delta)
-        else
-          self.caret_position = old_caret_position + delta
-        end
+        self.caret_position = caret_position_for_line_index(new_line_index) + [old_caret_position_line_position, new_lines[new_line_index].size].min
+        self.selection_count = old_selection_count.to_i if old_selection_count.to_i > 0
       end
   
       def move_down!
@@ -286,23 +371,18 @@ module Glimmer
         return if old_lines.size < 2
         old_selection_count = self.selection_count
         old_caret_position = self.caret_position
-        old_caret_position_line_index = line_index_for_caret_position(old_caret_position)
-        old_caret_position_line_caret_position = caret_position_for_caret_position_start_of_line(old_caret_position_line_index)
+        old_caret_position_line_caret_position = caret_position_for_caret_position_start_of_line(old_caret_position)
+        old_caret_position_line_position = old_caret_position - old_caret_position_line_caret_position
         old_end_caret_line_index = end_caret_position_line_index(caret_position, selection_count)
         new_lines = lines
         the_line_indices = line_indices_for_selection(caret_position, selection_count)
         the_lines = lines_for_selection(caret_position, selection_count)
         new_line_index = [the_line_indices.first + 1, new_lines.size - 1].min
-        delta = new_lines[new_line_index].size + 1
         new_lines[the_line_indices.first..the_line_indices.last] = []
         new_lines[new_line_index...new_line_index] = the_lines
         self.dirty_content = new_lines.join("\n")
-        if old_selection_count > 0
-          self.caret_position = caret_position_for_line_index(old_caret_position_line_index) + delta
-          self.selection_count = (caret_position_for_line_index(old_end_caret_line_index + 1) - self.caret_position + delta)
-        else
-          self.caret_position = old_caret_position + delta
-        end
+        self.caret_position = caret_position_for_line_index(new_line_index) + [old_caret_position_line_position, new_lines[new_line_index].size].min
+        self.selection_count = old_selection_count.to_i if old_selection_count.to_i > 0
       end
   
       def lines
@@ -318,12 +398,21 @@ module Glimmer
       end
   
       def caret_position_for_line_index(line_index)
-        lines[0...line_index].join("\n").size + 1
+        cp = lines[0...line_index].join("\n").size
+        cp += 1 if line_index > 0
+        cp
       end
   
       def caret_position_for_caret_position_start_of_line(caret_position)
         caret_position_for_line_index(line_index_for_caret_position(caret_position))
       end
+
+      # position within line containing "caret position" (e.g. for caret position 5 in 1st line, they match as 5, for 15 in line 2 with line 1 having 10 characters, line position is 4)
+      # TODO consider renaming to line_character_position_for_caret_position
+      def line_position_for_caret_position(caret_position)
+        caret_position = caret_position.to_i
+        caret_position - caret_position_for_caret_position_start_of_line(caret_position)
+      end
   
       def line_caret_positions_for_selection(caret_position, selection_count)
         line_indices = line_indices_for_selection(caret_position, selection_count)
@@ -358,6 +447,14 @@ module Glimmer
       def to_s
         path
       end
+      
+      def eql?(other)
+        self.path.eql?(other&.path)
+      end
+      
+      def hash
+        self.path.hash
+      end
     end  
   end
 end