vimamsa 0.1.26 → 0.1.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (170) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/appimage.yml +93 -0
  3. data/.gitignore +4 -1
  4. data/Dockerfile +7 -4
  5. data/README.md +62 -16
  6. data/custom_example.rb +43 -13
  7. data/doc/TODO.md +461 -0
  8. data/doc/bundling_plan.md +569 -0
  9. data/doc/key_bindings_report_plan.md +168 -0
  10. data/doc/missing_vim_bindings.md +71 -0
  11. data/doc/modules_settings_plan.md +433 -0
  12. data/doc/refactor_dedup_plan.md +117 -0
  13. data/doc/unused_code_plan.md +120 -0
  14. data/doc/vim_compatibility_plan.md +296 -0
  15. data/doc/vimlike_vim_conflicts.md +254 -0
  16. data/doc/vm_snapshots_plan.md +146 -0
  17. data/exe/run_tests.rb +117 -3
  18. data/exe/vimamsa +24 -4
  19. data/fonts/OFL-Oxanium.txt +93 -0
  20. data/fonts/Oxanium[wght].ttf +0 -0
  21. data/icon.png +0 -0
  22. data/img/demo.gif +0 -0
  23. data/lang/hyperplaintext.lang +6 -0
  24. data/lib/vimamsa/ack.rb +11 -1
  25. data/lib/vimamsa/actions.rb +4 -1
  26. data/lib/vimamsa/appimage_env.rb +35 -0
  27. data/lib/vimamsa/audio.rb +2 -5
  28. data/lib/vimamsa/bookmarks.rb +302 -0
  29. data/lib/vimamsa/buffer.rb +593 -82
  30. data/lib/vimamsa/buffer_changetext.rb +102 -42
  31. data/lib/vimamsa/buffer_cursor.rb +7 -0
  32. data/lib/vimamsa/buffer_list.rb +4 -0
  33. data/lib/vimamsa/buffer_manager.rb +4 -1
  34. data/lib/vimamsa/bundled_fonts.rb +32 -0
  35. data/lib/vimamsa/clipboard.rb +3 -0
  36. data/lib/vimamsa/conf.rb +59 -3
  37. data/lib/vimamsa/constants.rb +3 -0
  38. data/lib/vimamsa/crash_handler.rb +149 -0
  39. data/lib/vimamsa/debug.rb +4 -1
  40. data/lib/vimamsa/desktop_install.rb +96 -0
  41. data/lib/vimamsa/diff_buffer.rb +39 -10
  42. data/lib/vimamsa/easy_jump.rb +3 -0
  43. data/lib/vimamsa/editor.rb +263 -57
  44. data/lib/vimamsa/encrypt.rb +78 -29
  45. data/lib/vimamsa/file_finder.rb +4 -19
  46. data/lib/vimamsa/file_history.rb +3 -0
  47. data/lib/vimamsa/file_manager.rb +30 -15
  48. data/lib/vimamsa/fold.rb +226 -0
  49. data/lib/vimamsa/gui.rb +520 -106
  50. data/lib/vimamsa/gui_command_line.rb +208 -0
  51. data/lib/vimamsa/gui_dialog.rb +94 -42
  52. data/lib/vimamsa/gui_file_panel.rb +356 -25
  53. data/lib/vimamsa/gui_form_generator.rb +59 -35
  54. data/lib/vimamsa/gui_func_panel.rb +67 -22
  55. data/lib/vimamsa/gui_image.rb +3 -0
  56. data/lib/vimamsa/gui_keylog_panel.rb +246 -0
  57. data/lib/vimamsa/gui_menu.rb +23 -11
  58. data/lib/vimamsa/gui_select_window.rb +19 -48
  59. data/lib/vimamsa/gui_settings.rb +78 -37
  60. data/lib/vimamsa/gui_sourceview.rb +273 -19
  61. data/lib/vimamsa/gui_sourceview_autocomplete.rb +319 -90
  62. data/lib/vimamsa/gui_text.rb +63 -2
  63. data/lib/vimamsa/gui_theme.rb +606 -0
  64. data/lib/vimamsa/hook.rb +3 -0
  65. data/lib/vimamsa/hyper_plain_text.rb +3 -0
  66. data/lib/vimamsa/key_actions.rb +112 -13
  67. data/lib/vimamsa/key_binding_tree.rb +242 -215
  68. data/lib/vimamsa/key_bindings_notepad.rb +43 -0
  69. data/lib/vimamsa/key_bindings_report.rb +261 -0
  70. data/lib/vimamsa/key_bindings_vim.rb +354 -0
  71. data/lib/vimamsa/key_bindings_vimlike.rb +65 -9
  72. data/lib/vimamsa/langservp.rb +271 -54
  73. data/lib/vimamsa/macro.rb +3 -0
  74. data/lib/vimamsa/main.rb +14 -8
  75. data/lib/vimamsa/rbvma.rb +26 -1
  76. data/lib/vimamsa/search.rb +3 -0
  77. data/lib/vimamsa/search_replace.rb +11 -10
  78. data/lib/vimamsa/string_util.rb +120 -40
  79. data/lib/vimamsa/terminal.rb +3 -0
  80. data/lib/vimamsa/test_framework.rb +28 -2
  81. data/lib/vimamsa/tests.rb +3 -0
  82. data/lib/vimamsa/text_objects.rb +353 -0
  83. data/lib/vimamsa/text_transforms.rb +14 -0
  84. data/lib/vimamsa/util.rb +46 -7
  85. data/lib/vimamsa/version.rb +1 -1
  86. data/lib/vimamsa.rb +0 -1
  87. data/modules/color_highlight/color_highlight.rb +118 -0
  88. data/modules/color_highlight/color_highlight_info.rb +3 -0
  89. data/modules/dictation/dictation.rb +1054 -0
  90. data/modules/dictation/dictation_info.rb +3 -0
  91. data/modules/dictation/whisper_worker.py +273 -0
  92. data/modules/ollama/ollama.rb +107 -0
  93. data/modules/ollama/ollama_info.rb +3 -0
  94. data/modules/tts/tts.rb +119 -0
  95. data/modules/tts/tts_info.rb +3 -0
  96. data/run_e2e_vm.sh +28 -0
  97. data/run_tests_vm.sh +130 -0
  98. data/scripts/appimage/AppRun +54 -0
  99. data/scripts/appimage/Dockerfile +18 -0
  100. data/scripts/appimage/build.sh +19 -0
  101. data/scripts/appimage/build_in_container.sh +192 -0
  102. data/scripts/appimage/smoke_test.sh +27 -0
  103. data/scripts/demo/demo_steps.txt +59 -0
  104. data/scripts/demo/record_demo.rb +177 -0
  105. data/scripts/demo/shapes.rb +28 -0
  106. data/styles/134272-molokai.xml +3 -0
  107. data/styles/molokai_cyber.xml +48 -0
  108. data/styles/molokai_edit.xml +1 -0
  109. data/tests/support/virtual_keyboard.rb +254 -0
  110. data/tests/support/virtual_mic.rb +67 -0
  111. data/tests/test_ack.rb +22 -0
  112. data/tests/test_auto_format.rb +122 -0
  113. data/tests/test_autocomplete.rb +211 -0
  114. data/tests/test_autosave.rb +145 -0
  115. data/tests/test_basic_editing.rb +33 -3
  116. data/tests/test_bookmarks.rb +206 -0
  117. data/tests/test_bracket_match.rb +85 -0
  118. data/tests/test_bundling.rb +92 -0
  119. data/tests/test_color_highlight.rb +92 -0
  120. data/tests/test_command_line.rb +79 -0
  121. data/tests/test_command_line_file.rb +27 -0
  122. data/tests/test_context_menu_file.rb +129 -0
  123. data/tests/test_copy_paste.rb +80 -0
  124. data/tests/test_crash_handler.rb +39 -0
  125. data/tests/test_custom_two_phase.rb +92 -0
  126. data/tests/test_dialog_callback_errors.rb +44 -0
  127. data/tests/test_dictation.rb +294 -0
  128. data/tests/test_diff_buffer_name.rb +51 -0
  129. data/tests/test_double_click.rb +41 -0
  130. data/tests/test_drag_selection.rb +125 -0
  131. data/tests/test_e2e_cmdline.rb +116 -0
  132. data/tests/test_e2e_dictation.rb +98 -0
  133. data/tests/test_e2e_replace_char.rb +58 -0
  134. data/tests/test_extract_file_links.rb +55 -0
  135. data/tests/test_file_format.rb +217 -0
  136. data/tests/test_file_manager.rb +72 -0
  137. data/tests/test_file_panel.rb +269 -0
  138. data/tests/test_flash.rb +78 -0
  139. data/tests/test_fold.rb +111 -0
  140. data/tests/test_font_refresh.rb +56 -0
  141. data/tests/test_func_panel.rb +68 -0
  142. data/tests/test_grep_apply.rb +46 -0
  143. data/tests/test_gtk_sync.rb +126 -0
  144. data/tests/test_hpt_highlight_visible.rb +75 -0
  145. data/tests/test_hpt_link_highlight.rb +82 -0
  146. data/tests/test_jump_to_file.rb +41 -0
  147. data/tests/test_key_bindings.rb +208 -0
  148. data/tests/test_keylog_panel.rb +101 -0
  149. data/tests/test_lsp_clangd.rb +281 -0
  150. data/tests/test_lsp_jump.rb +87 -0
  151. data/tests/test_lsp_position_encoding.rb +49 -0
  152. data/tests/test_lsp_symbols.rb +68 -0
  153. data/tests/test_macro.rb +137 -0
  154. data/tests/test_markdown_highlight.rb +57 -0
  155. data/tests/test_mode_badge.rb +41 -0
  156. data/tests/test_notepad_bindings.rb +67 -0
  157. data/tests/test_popup_queue.rb +51 -0
  158. data/tests/test_random_edit.rb +109 -0
  159. data/tests/test_revert.rb +127 -0
  160. data/tests/test_startup_file.rb +58 -0
  161. data/tests/test_status_area.rb +50 -0
  162. data/tests/test_text_objects.rb +163 -0
  163. data/tests/test_text_transforms.rb +329 -0
  164. data/tests/test_tts.rb +68 -0
  165. data/tests/test_vim_bindings.rb +252 -0
  166. data/tests/test_vim_conflicts.rb +63 -0
  167. data/tests/test_window_layout.rb +219 -0
  168. data/vimamsa.gemspec +3 -1
  169. data/vm_guest_run.sh +109 -0
  170. metadata +112 -10
@@ -1,3 +1,5 @@
1
+
2
+ module Vimamsa
1
3
  SETTINGS_DEFS = [
2
4
  {
3
5
  :label => "Tab / Indent",
@@ -18,6 +20,7 @@ SETTINGS_DEFS = [
18
20
  :label => "Appearance",
19
21
  :settings => [
20
22
  { :key => [:match, :highlight, :color], :label => "Search highlight color", :type => :string },
23
+ { :key => [:theme, :cyberpunk_glow], :label => "Cyberpunk glow theme (neon glow & shadows)", :type => :bool },
21
24
  { :key => [:kbd, :show_prev_action], :label => "Show previous action in toolbar", :type => :bool },
22
25
  { :key => [:style_scheme], :label => "Color scheme", :type => :select,
23
26
  :options => proc {
@@ -25,6 +28,7 @@ SETTINGS_DEFS = [
25
28
  ssm.set_search_path(ssm.search_path << ppath("styles/"))
26
29
  ssm.scheme_ids.reject { |id| [VIMAMSA_OVERLAY_SCHEME_ID, VIMAMSA_CONTRAST_SCHEME_ID].include?(id) }.sort
27
30
  } },
31
+ { :key => [:color_adjustments, :enabled], :label => "Enable color scheme contrast/brightness adjustments", :type => :bool },
28
32
  { :key => [:color_contrast], :label => "Color scheme contrast (1.0 = original)", :type => :float, :min => 0.5, :max => 2.0, :step => 0.05 },
29
33
  { :key => [:color_brightness], :label => "Color scheme brightness (0.0 = original)", :type => :float, :min => -0.5, :max => 0.5, :step => 0.01 },
30
34
  ],
@@ -32,10 +36,26 @@ SETTINGS_DEFS = [
32
36
  {
33
37
  :label => "Behavior",
34
38
  :settings => [
39
+ { :key => [:keybindings, :scheme], :label => "Keybinding scheme (requires restart)",
40
+ :type => :select, :options => ["vimlike", "vim", "notepad"] },
35
41
  { :key => [:lsp, :enabled], :label => "Enable LSP (Language Server)", :type => :bool },
36
42
  { :key => [:experimental], :label => "Enable experimental features", :type => :bool },
37
43
  { :key => [:macro, :animation_delay], :label => "Macro animation delay (sec)", :type => :float, :min => 0.0, :max => 2.0, :step => 0.0001 },
38
44
  { :key => [:paste, :cursor_at_start], :label => "Leave cursor at start of pasted text", :type => :bool },
45
+ { :key => [:mouse, :drag_selection], :label => "Move selected text by dragging it with the mouse (off: pressing inside a selection starts a new one)", :type => :bool },
46
+ { :key => [:file_format, :on_save],
47
+ :label => "Saving files not in UTF-8 + LF (e.g. Latin-1, CRLF): ask / keep original format / convert to UTF-8 + LF",
48
+ :type => :select, :options => ["ask", "keep", "convert"] },
49
+ ],
50
+ },
51
+ {
52
+ :label => "Autocomplete",
53
+ :settings => [
54
+ { :key => [:autocomplete, :enabled], :label => "Enable autocomplete", :type => :bool },
55
+ { :key => [:autocomplete, :auto_trigger], :label => "Show popup while typing (off: manual key only)", :type => :bool },
56
+ { :key => [:autocomplete, :min_chars], :label => "Min characters before auto popup", :type => :int, :min => 1, :max => 10, :step => 1 },
57
+ { :key => [:autocomplete, :max_items], :label => "Max candidates in list", :type => :int, :min => 1, :max => 200, :step => 1 },
58
+ { :key => [:autocomplete, :visible_items], :label => "Visible rows in popup", :type => :int, :min => 1, :max => 40, :step => 1 },
39
59
  ],
40
60
  },
41
61
  {
@@ -72,10 +92,7 @@ end
72
92
  class SettingsDialog
73
93
  def initialize
74
94
  @widgets = {}
75
- @window = Gtk::Window.new
76
- @window.set_transient_for($vmag.window) if $vmag&.window
77
- @window.modal = true
78
- @window.title = "Preferences"
95
+ @window = make_modal_window("Preferences")
79
96
  @window.default_width = 500
80
97
 
81
98
  outer = Gtk::Box.new(:vertical, 12)
@@ -133,17 +150,7 @@ class SettingsDialog
133
150
  hbox.append(save_btn)
134
151
  outer.append(hbox)
135
152
 
136
- press = Gtk::EventControllerKey.new
137
- press.set_propagation_phase(Gtk::PropagationPhase::CAPTURE)
138
- @window.add_controller(press)
139
- press.signal_connect("key-pressed") do |_g, keyval, _kc, _y|
140
- if keyval == Gdk::Keyval::KEY_Escape
141
- @window.destroy
142
- true
143
- else
144
- false
145
- end
146
- end
153
+ on_submit_escape(@window, escape: proc { @window.destroy })
147
154
  end
148
155
 
149
156
  def make_widget(s)
@@ -180,17 +187,8 @@ class SettingsDialog
180
187
  store = Gtk::ListStore.new(String)
181
188
  paths.each { |p| store.append[0] = p }
182
189
 
183
- tv = Gtk::TreeView.new(store)
184
- tv.headers_visible = false
185
- renderer = Gtk::CellRendererText.new
186
- renderer.ellipsize = Pango::EllipsizeMode::START
187
- col = Gtk::TreeViewColumn.new("", renderer, text: 0)
188
- col.expand = true
189
- tv.append_column(col)
190
-
191
- sw = Gtk::ScrolledWindow.new
192
- sw.set_policy(:automatic, :automatic)
193
- sw.set_child(tv)
190
+ tv, sw = build_list_tree(store, ellipsize: Pango::EllipsizeMode::START,
191
+ single_click: false, hpolicy: :automatic)
194
192
  sw.set_size_request(-1, 120)
195
193
  sw.vexpand = true
196
194
 
@@ -201,6 +199,7 @@ class SettingsDialog
201
199
  :action => :select_folder,
202
200
  :buttons => [["Select", :accept], ["Cancel", :cancel]],
203
201
  )
202
+ chooser.add_css_class("vma-dialog")
204
203
  chooser.set_transient_for(@window)
205
204
  chooser.modal = true
206
205
  chooser.signal_connect("response") do |dlg, resp|
@@ -249,9 +248,15 @@ class SettingsDialog
249
248
  end
250
249
  cnf_set(key, val) unless val.nil?
251
250
  end
251
+ # Before save_settings_to_file: gui_refresh_colors re-reads every cnf color
252
+ # and reloads the CSS providers live, and (via gui_refresh_theme) may flip
253
+ # cnf.style_scheme to keep the buffer scheme in step with the theme toggle.
254
+ gui_refresh_colors
252
255
  save_settings_to_file
253
256
  gui_refresh_font
254
257
  gui_refresh_style_scheme
258
+ # Re-highlight color swatches after a color change, if the plugin is loaded.
259
+ vma.gui.buffers.each_value { |v| v.highlight_colors if v.respond_to?(:highlight_colors) }
255
260
  activate_no_restart_modules
256
261
  @window.destroy
257
262
  end
@@ -402,18 +407,52 @@ def style_fg_attr(sty, style_name, default_fg = nil)
402
407
  fg ? " foreground=\"#{fg}\"" : ""
403
408
  end
404
409
 
410
+ # Markup styles used by markdown.lang (and rst, asciidoc, ...). def.lang gives
411
+ # them no fallback, so a scheme that doesn't define them draws headings, code
412
+ # and links as plain text. Each is
413
+ # name => [attributes, styles to take the foreground from (first one set)]
414
+ MARKUP_OVERLAY_STYLES = {
415
+ "def:heading" => ['bold="true"', ["def:heading1", "def:keyword"]],
416
+ "def:strong-emphasis" => ['bold="true"', []],
417
+ "def:emphasis" => ['italic="true"', []],
418
+ "def:inline-code" => ["", ["def:string"]],
419
+ "def:preformatted-section" => ["", ["def:string"]],
420
+ "def:link-text" => ['underline="low"', ["def:hyperlink"]],
421
+ "def:link-destination" => ["", ["def:comment"]],
422
+ "def:link-symbol" => ["", ["def:comment"]],
423
+ "def:list-marker" => ['bold="true"', ["def:statement", "def:keyword"]],
424
+ "def:thematic-break" => ["", ["def:comment"]],
425
+ }
426
+
427
+ # <style> lines for the MARKUP_OVERLAY_STYLES the parent scheme lacks. Styles
428
+ # the parent defines (all stock GtkSourceView schemes do) are left alone.
429
+ def markup_overlay_styles(parent_sty)
430
+ MARKUP_OVERLAY_STYLES.filter_map { |name, (attrs, from)|
431
+ next if parent_sty&.get_style(name)
432
+ fg = from.lazy.map { |f| parent_sty&.get_style(f)&.foreground }.find { |c| c && !c.empty? }
433
+ fg = "#4FC3F7" if fg.nil? && name == "def:link-text"
434
+ a = [attrs, fg && "foreground=\"#{fg}\""].reject { |x| x.nil? || x.empty? }.join(" ")
435
+ " <style name=\"#{name}\" #{a}/>"
436
+ }.join("\n ")
437
+ end
438
+
405
439
  # Generate a GtkSourceView style scheme that inherits from base_scheme_id
406
440
  # (optionally contrast-adjusted) and overlays Vimamsa-specific heading/
407
441
  # hyperlink styles on top. Written to styles/_vimamsa_overlay.xml.
408
442
  # Foreground colors are read from the parent scheme so they are preserved.
409
443
  def generate_vimamsa_overlay(base_scheme_id)
410
- contrast = (cnf_get([:color_contrast]) || 1.0).to_f
411
- brightness = (cnf_get([:color_brightness]) || 0.0).to_f
412
- parent_id = apply_contrast_transformation(base_scheme_id, contrast, brightness)
444
+ adjustments_enabled = cnf_get([:color_adjustments, :enabled]) != false
445
+ parent_id = base_scheme_id
446
+ if adjustments_enabled
447
+ contrast = (cnf_get([:color_contrast]) || 1.0).to_f
448
+ brightness = (cnf_get([:color_brightness]) || 0.0).to_f
449
+ parent_id = apply_contrast_transformation(base_scheme_id, contrast, brightness)
450
+ end
413
451
 
414
452
  # Load the parent scheme to read existing foreground colors for headings/links
453
+ user_styles_dir = File.expand_path("~/.config/vimamsa/styles")
415
454
  ssm = GtkSource::StyleSchemeManager.new
416
- ssm.set_search_path(ssm.search_path << ppath("styles/"))
455
+ ssm.set_search_path(ssm.search_path << ppath("styles/") << user_styles_dir)
417
456
  parent_sty = ssm.get_scheme(parent_id)
418
457
 
419
458
  xml = <<~XML
@@ -421,17 +460,17 @@ def generate_vimamsa_overlay(base_scheme_id)
421
460
  <style-scheme id="#{VIMAMSA_OVERLAY_SCHEME_ID}" name="#{VIMAMSA_OVERLAY_SCHEME_ID}" version="1.0" parent-scheme="#{parent_id}">
422
461
  <style name="def:title" scale="2.0" bold="true"#{style_fg_attr(parent_sty, "def:title")}/>
423
462
  <style name="def:hyperlink" bold="true"#{style_fg_attr(parent_sty, "def:hyperlink", "#4FC3F7")}/>
424
- <style name="def:heading0" scale="2.0" bold="true"#{style_fg_attr(parent_sty, "def:heading0")}/>
425
- <style name="def:heading1" scale="1.75" bold="true"#{style_fg_attr(parent_sty, "def:heading1")}/>
426
- <style name="def:heading2" scale="1.5" bold="true"#{style_fg_attr(parent_sty, "def:heading2")}/>
463
+ <style name="def:heading0" scale="2.0" bold="true"#{style_fg_attr(parent_sty, "def:heading0")} underline="low"/>
464
+ <style name="def:heading1" scale="1.75" bold="true"#{style_fg_attr(parent_sty, "def:heading1")} underline="low"/>
465
+ <style name="def:heading2" scale="1.5" bold="true"#{style_fg_attr(parent_sty, "def:heading2")} underline="low"/>
427
466
  <style name="def:heading3" scale="1.25" bold="true"#{style_fg_attr(parent_sty, "def:heading3")}/>
428
467
  <style name="def:heading4" scale="1.175" bold="true"#{style_fg_attr(parent_sty, "def:heading4")}/>
429
468
  <style name="def:heading5" scale="1.1" bold="true"#{style_fg_attr(parent_sty, "def:heading5")}/>
430
469
  <style name="def:heading6" scale="1.0" bold="true"#{style_fg_attr(parent_sty, "def:heading6")}/>
431
470
  <style name="def:bold" bold="true"/>
471
+ #{markup_overlay_styles(parent_sty)}
432
472
  </style-scheme>
433
473
  XML
434
- user_styles_dir = File.expand_path("~/.config/vimamsa/styles")
435
474
  FileUtils.mkdir_p(user_styles_dir)
436
475
  IO.write(File.join(user_styles_dir, "_vimamsa_overlay.xml"), xml)
437
476
  end
@@ -467,7 +506,9 @@ end
467
506
 
468
507
  # Apply dark/light GTK preference to match the given style scheme.
469
508
  def gui_apply_color_mode(sty)
470
- Gtk::Settings.default.gtk_application_prefer_dark_theme = !scheme_is_light?(sty)
509
+ light = scheme_is_light?(sty)
510
+ Gtk::Settings.default.gtk_application_prefer_dark_theme = !light
511
+ $vmag.scheme_is_light = light if $vmag
471
512
  end
472
513
 
473
514
  def gui_refresh_style_scheme
@@ -484,9 +525,9 @@ def gui_refresh_font
484
525
  return unless $vmag
485
526
  provider = Gtk::CssProvider.new
486
527
  provider.load(data: "textview { font-family: #{get(cnf.font.family)}; font-size: #{get(cnf.font.size)}pt; }")
487
- for _k, window in $vmag.windows
488
- view = window[:sw].child
528
+ vma.gui.buffers.each_value do |view|
489
529
  next if view.nil?
490
530
  view.style_context.add_provider(provider)
491
531
  end
492
532
  end
533
+ end # module Vimamsa