canopus 0.4.0 → 0.5.0

data/lib/canopus/theme.rb

@@ -8,10 +8,19 @@ module Canopus
       "Literal.String" => "#356224", "Literal.Number" => "#854b16", "Operator" => "#375780", "Generic.Heading" => "#795500", "Error" => "#aa2438"}.freeze
     DARK = {background: "#161b22", foreground: "#d6dde6", panel: "#10151c", border: "#2c3644",
       active_tab: "#222d3b", muted: "#728399", accent: "#e9a661", selection: "#34547799",
-      cursor: "#f4e4c1", current_line: "#ffffff06", error: "#f97583", status: "#202a36"}.freeze
+      cursor: "#f4e4c1", current_line: "#ffffff06", error: "#f97583", status: "#202a36",
+      :"diagnostic.error" => "#f97583", :"diagnostic.warning" => "#e3b341",
+      :"diagnostic.information" => "#58a6ff", :"diagnostic.hint" => "#8b949e",
+      :"bracket.1" => "#ffd866", :"bracket.2" => "#ab9df2", :"bracket.3" => "#78dce8",
+      :"bracket.4" => "#a9dc76", :"bracket.5" => "#fc9867", :"bracket.6" => "#ff6188",
+      :"indent.guide" => "#394657", :"indent.guide.active" => "#7c91aa"}.freeze
     LIGHT = DARK.merge(background: "#faf8f3", foreground: "#293440", panel: "#eeece6", border: "#cecac1",
       active_tab: "#fff", muted: "#6d7780", selection: "#93bdd477", current_line: "#00000006",
-      cursor: "#34465a", status: "#e3e2dc").freeze
+      cursor: "#34465a", status: "#e3e2dc", :"diagnostic.error" => "#aa2438",
+      :"diagnostic.warning" => "#8a6116", :"diagnostic.information" => "#0969da",
+      :"diagnostic.hint" => "#57606a", :"bracket.1" => "#8a5a00", :"bracket.2" => "#6f42c1",
+      :"bracket.3" => "#096b7a", :"bracket.4" => "#3f6f20", :"bracket.5" => "#a34318",
+      :"bracket.6" => "#b42355", :"indent.guide" => "#c4c9cf", :"indent.guide.active" => "#73808c").freeze
     attr_reader :colors, :syntax, :name
     def initialize(name: "Canopus Dark", colors: {}, syntax: {})
       @name, @syntax = name, syntax
@@ -29,13 +38,28 @@ module Canopus
         key ? @token_mapping[key] : self[:foreground]
       end
     end
-    def self.load(path)
+    def self.load(path, warnings: nil)
+      if File.extname(path).downcase == ".tmtheme"
+        require_relative "theme/import"
+        return Import.load(path, warnings: warnings)
+      end
+
       data = Kochab.parse(File.read(path), strict: false).value
+      if data.is_a?(Hash) && (data.key?("colors") || data.key?("tokenColors"))
+        require_relative "theme/import"
+        return Import.vscode(data, warnings: warnings)
+      end
+
       theme = data.fetch("themes", [data]).first
       style = theme.fetch("style", {})
       map = {"editor.background" => :background, "editor.foreground" => :foreground,
         "panel.background" => :panel, "border" => :border, "text.muted" => :muted,
-        "status_bar.background" => :status, "editor.active_line.background" => :current_line}
+        "status_bar.background" => :status, "editor.active_line.background" => :current_line,
+        "diagnostic.error" => :"diagnostic.error", "diagnostic.warning" => :"diagnostic.warning",
+        "diagnostic.information" => :"diagnostic.information", "diagnostic.hint" => :"diagnostic.hint",
+        "bracket.1" => :"bracket.1", "bracket.2" => :"bracket.2", "bracket.3" => :"bracket.3",
+        "bracket.4" => :"bracket.4", "bracket.5" => :"bracket.5", "bracket.6" => :"bracket.6",
+        "indent.guide" => :"indent.guide", "indent.guide.active" => :"indent.guide.active"}
       colors = style.each_with_object({}) { |(key, value), result| result[map[key]] = value if map[key] }
       new(name: theme.fetch("name", "Imported"), colors: colors, syntax: style.fetch("syntax", {}))
     end

data/lib/canopus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Canopus
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/canopus/vim/motionable.rb

@@ -259,7 +259,7 @@ module Canopus
 
     def cell_width(character, column)
       return @editor.tab_size - column % @editor.tab_size if character == "\t"
-      defined?(Terminal::Grid) ? [Terminal::Grid.width(character), 1].max : 1
+      [Tarazed::Grid.width(character), 1].max
     end
 
     def block_columns

data/lib/canopus/vim.rb

@@ -209,24 +209,18 @@ module Canopus
         end
       when "delete" then @editor.delete_forward
       when "left", "right", "up", "down" then @editor.move(key.to_sym)
-      when "enter" then @editor.insert_text("\n")
-      when "tab" then @editor.insert_text(@editor.use_tabs ? "\t" : " " * @editor.tab_size)
+      when "enter" then @editor.insert_text("\n", pair: false)
+      when "tab" then @editor.insert_text(@editor.use_tabs ? "\t" : " " * @editor.tab_size, pair: false)
       else
         return unless key.grapheme_clusters.length == 1
-        auto_pairs = @editor.auto_pairs
-        begin
-          @editor.auto_pairs = false
-          if @mode == :replace
-            first = @editor.primary.head
-            ending = horizontal(first, 1, insertion: true)
-            original = @editor.buffer.rope.byteslice(first...ending).to_s
-            @editor.select(first, ending)
-            @replace_stack << [first, first + key.bytesize, original]
-          end
-          @editor.insert_text(key)
-        ensure
-          @editor.auto_pairs = auto_pairs
+        if @mode == :replace
+          first = @editor.primary.head
+          ending = horizontal(first, 1, insertion: true)
+          original = @editor.buffer.rope.byteslice(first...ending).to_s
+          @editor.select(first, ending)
+          @replace_stack << [first, first + key.bytesize, original]
         end
+        @editor.insert_text(key, pair: false)
       end
     end
 
@@ -243,7 +237,7 @@ module Canopus
       when "A" then @editor.select(line_end(row_at(cursor_position)))
       when "o"
         @editor.select(line_end(row_at(cursor_position)))
-        @editor.insert_text("\n")
+        @editor.insert_text("\n", pair: false)
       when "O"
         row = row_at(cursor_position)
         indent = @editor.buffer.line(row)[/\A[ \t]*/]

data/lib/canopus/workspace/auto_savable.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module Canopus
+  module Workspace::AutoSavable
+    def poll_auto_save(now: Process.clock_gettime(Process::CLOCK_MONOTONIC))
+      return false if @closed
+      mode = @settings["auto_save"]
+      delay = @settings["auto_save_delay"]
+      current = editor&.buffer
+      config = [mode, delay]
+      if @auto_save_config != config
+        reset_auto_save
+        @auto_save_config = config
+        @auto_save_focus_buffer = current
+        return false unless mode == "after_delay"
+      end
+
+      case mode
+      when "on_focus_change"
+        previous, @auto_save_focus_buffer = @auto_save_focus_buffer, current
+        return false unless previous && !previous.equal?(current)
+        saved = false
+        auto_save_sources(previous).each { |buffer| saved = auto_save_buffer(buffer) || saved }
+        saved
+      when "after_delay"
+        buffers = auto_save_buffers
+        @auto_save_pending ||= {}.compare_by_identity
+        @auto_save_pending.delete_if { |buffer, _| !buffers.include?(buffer) }
+        attempted = false
+        buffers.each do |buffer|
+          unless auto_save_eligible?(buffer)
+            @auto_save_pending.delete(buffer)
+            next
+          end
+          version = buffer.version
+          state = @auto_save_pending[buffer]
+          if !state || state[0] != version
+            @auto_save_pending[buffer] = [version, now + delay / 1_000.0, false]
+            next
+          end
+          next if state[2] || now < state[1]
+          state[2] = true
+          attempted = auto_save_buffer(buffer) || attempted
+        end
+        attempted
+      else
+        reset_auto_save
+        @auto_save_config = config
+        @auto_save_focus_buffer = current
+        false
+      end
+    end
+
+    def reset_auto_save
+      @auto_save_pending&.clear
+      @auto_save_focus_buffer = nil
+      nil
+    end
+
+    private
+
+    def auto_save_buffers
+      @buffers.values.flat_map { |buffer| auto_save_sources(buffer) }.uniq
+    end
+
+    def auto_save_sources(buffer)
+      buffer.is_a?(MultiBuffer) ? buffer.excerpts.map(&:buffer).uniq : [buffer]
+    end
+
+    def auto_save_eligible?(buffer)
+      buffer.path && !buffer.read_only && buffer.dirty?
+    end
+
+    def auto_save_buffer(buffer)
+      return false unless auto_save_eligible?(buffer)
+      save_buffer(buffer)
+      true
+    rescue StandardError => error
+      notify("Auto-save failed: #{error.message}")
+      false
+    end
+  end
+end