textbringer 24 → 25

data/lib/textbringer/window.rb

@@ -33,6 +33,8 @@ module Textbringer
     @@minibuffer_selected = nil
     @@echo_area = nil
     @@has_colors = false
+    @@default_fg = "default"
+    @@default_bg = "default"
 
     def self.list(include_echo_area: false)
       if include_echo_area
@@ -133,15 +135,16 @@ module Textbringer
     end
 
     def self.set_default_colors(fg, bg)
-      Curses.assume_default_colors(Color[fg], Color[bg])
-      Window.redraw
+      new_fg = fg || @@default_fg
+      new_bg = bg || @@default_bg
+      Curses.assume_default_colors(Color[new_fg], Color[new_bg])
+      @@default_fg = new_fg
+      @@default_bg = new_bg
+      Face.define(:default, foreground: new_fg, background: new_bg)
+      Window.redraw if @@started
     end
 
     def self.load_faces
-      require_relative "faces/basic"
-      require_relative "faces/programming"
-      require_relative "faces/completion"
-      require_relative "faces/dired"
       require_relative "faces/gamegrid"
     end
 
@@ -149,6 +152,7 @@ module Textbringer
       if @@started
         raise EditorError, "Already started"
       end
+      Theme.detect_background
       Curses.init_screen
       Curses.noecho
       Curses.raw
@@ -404,39 +408,18 @@ module Textbringer
     def highlight
       @highlight_on = {}
       @highlight_off = {}
-      if (override = @buffer[:highlight_override])
-        @highlight_on, @highlight_off = override.call
-        return
-      end
       return if !@@has_colors || !CONFIG[:syntax_highlight] || @buffer.binary?
-      syntax_table = @buffer.mode.syntax_table || DEFAULT_SYNTAX_TABLE
-      if @buffer.bytesize < CONFIG[:highlight_buffer_size_limit]
-        base_pos = @buffer.point_min
-        s = @buffer.to_s
-      else
-        base_pos = @buffer.point
-        len = columns * (lines - 1) / 2 * 3
-        s = @buffer.substring(@buffer.point, @buffer.point + len).scrub("")
-      end
-      return if !s.valid_encoding?
-      re_str = syntax_table.map { |name, re|
-        "(?<#{name}>#{re})"
-      }.join("|")
-      re = Regexp.new(re_str)
-      names = syntax_table.keys
-      s.scan(re) do
-        b = base_pos + $`.bytesize
-        e = b + $&.bytesize
-        if b < @buffer.point && @buffer.point < e
-          b = @buffer.point
-        end
-        name = names.find { |n| $~[n] }
-        face = Face[name]
-        if face
-          @highlight_on[b] = face
-          @highlight_off[e] = true
-        end
-      end
+      ctx = HighlightContext.new(
+        buffer: @buffer,
+        highlight_start: @buffer.point,
+        # Use * 4 (max UTF-8 bytes per character) to ensure multi-byte
+        # characters near the bottom of the window are fully covered.
+        highlight_end: [@buffer.point + columns * (lines - 1) * 4,
+                        @buffer.point_max].min,
+        highlight_on: @highlight_on,
+        highlight_off: @highlight_off
+      )
+      @buffer.mode.highlight(ctx)
     end
 
     def redisplay
@@ -732,7 +715,8 @@ module Textbringer
       @mode_line.addstr(" #{line},#{column}")
       @mode_line.addstr(" (#{@buffer.mode_names.join(' ')})")
       @mode_line.addstr(" " * (columns - @mode_line.curx))
-      @mode_line.attr_set(0, 0)
+      default = Face[:default]
+      @mode_line.attr_set(default&.text_attrs || 0, default&.color_pair || 0)
       @mode_line.noutrefresh
     end
 
@@ -972,6 +956,7 @@ module Textbringer
     end
 
     def apply_face_attrs(win, face)
+      face ||= Face[:default]
       win.attr_set(face&.text_attrs || 0, face&.color_pair || 0)
     end
 
@@ -991,7 +976,8 @@ module Textbringer
         end
         win.attr_set(text_attrs, face.color_pair)
       else
-        win.attr_set(0, 0)
+        default = Face[:default]
+        win.attr_set(default&.text_attrs || 0, default&.color_pair || 0)
       end
     end
   end
@@ -1040,7 +1026,8 @@ module Textbringer
           @window.addstr(@buffer.input_method_status)
         end
         @window.setpos(0, 0)
-        @window.attr_set(0, 0)
+        default = Face[:default]
+        @window.attr_set(default&.text_attrs || 0, default&.color_pair || 0)
         @in_region = false
         @in_isearch = false
         @current_hl_face = nil

data/lib/textbringer.rb

@@ -9,6 +9,8 @@ require_relative "textbringer/keymap"
 require_relative "textbringer/utils"
 require_relative "textbringer/color"
 require_relative "textbringer/face"
+require_relative "textbringer/highlight_context"
+require_relative "textbringer/theme"
 require_relative "textbringer/completion_popup"
 require_relative "textbringer/lsp/client"
 require_relative "textbringer/lsp/server_registry"

data/textbringer.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 3.2'
 
+  spec.add_runtime_dependency "prism"
   spec.add_runtime_dependency "rdoc"
   spec.add_runtime_dependency "ostruct"
   spec.add_runtime_dependency "irb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: '24'
+  version: '25'
 platform: ruby
 authors:
 - Shugo Maeda
@@ -9,6 +9,20 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -387,14 +401,11 @@ files:
 - lib/textbringer/default_output.rb
 - lib/textbringer/errors.rb
 - lib/textbringer/face.rb
-- lib/textbringer/faces/basic.rb
-- lib/textbringer/faces/completion.rb
-- lib/textbringer/faces/dired.rb
 - lib/textbringer/faces/gamegrid.rb
-- lib/textbringer/faces/programming.rb
 - lib/textbringer/floating_window.rb
 - lib/textbringer/gamegrid.rb
 - lib/textbringer/global_minor_mode.rb
+- lib/textbringer/highlight_context.rb
 - lib/textbringer/input_method.rb
 - lib/textbringer/input_methods/hangul_input_method.rb
 - lib/textbringer/input_methods/hiragana_input_method.rb
@@ -421,6 +432,13 @@ files:
 - lib/textbringer/modes/transient_mark_mode.rb
 - lib/textbringer/plugin.rb
 - lib/textbringer/ring.rb
+- lib/textbringer/theme.rb
+- lib/textbringer/themes/catppuccin.rb
+- lib/textbringer/themes/github.rb
+- lib/textbringer/themes/gruvbox.rb
+- lib/textbringer/themes/molokai.rb
+- lib/textbringer/themes/sonokai.rb
+- lib/textbringer/themes/tokyonight.rb
 - lib/textbringer/utils.rb
 - lib/textbringer/version.rb
 - lib/textbringer/window.rb

data/lib/textbringer/faces/basic.rb

@@ -1,8 +0,0 @@
-module Textbringer
-  Face.define :mode_line, reverse: true
-  Face.define :link, foreground: "blue", bold: true
-  Face.define :control
-  Face.define :region, background: "blue", foreground: "white"
-  Face.define :isearch, background: "yellow", foreground: "black"
-  Face.define :floating_window, background: "cyan", foreground: "black"
-end

data/lib/textbringer/faces/completion.rb

@@ -1,4 +0,0 @@
-module Textbringer
-  Face.define :completion_popup, background: "white", foreground: "black"
-  Face.define :completion_popup_selected, background: "blue", foreground: "white"
-end

data/lib/textbringer/faces/dired.rb

@@ -1,6 +0,0 @@
-module Textbringer
-  Face.define :dired_directory,  foreground: "magenta"
-  Face.define :dired_symlink,    foreground: "cyan"
-  Face.define :dired_executable, foreground: "green"
-  Face.define :dired_flagged,    foreground: "red"
-end

data/lib/textbringer/faces/programming.rb

@@ -1,6 +0,0 @@
-module Textbringer
-  Face.define :comment, foreground: "yellow"
-  Face.define :preprocessing_directive, foreground: "green"
-  Face.define :keyword, foreground: "magenta", bold: true
-  Face.define :string, foreground: "blue", bold: true
-end