From 0de0c4ca23a4b34f56c1696a23f1038beb9b91b2 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 20 Jul 2022 21:26:37 +0100 Subject: [PATCH] feat(text-editing): replace toggle-quotes with cycle-quotes package It seems cycle-quotes does a better job than toggle-quotes. For example it supports literal backtick strings in Go, which toggle-quotes does not. --- core/siren-core-modules.el | 2 +- modules/languages/siren-ruby.el | 4 ++-- modules/text-editing/siren-cycle-quotes.el | 14 ++++++++++++++ straight/versions/default.el | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 modules/text-editing/siren-cycle-quotes.el diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el index 88cd871..1a0c299 100644 --- a/core/siren-core-modules.el +++ b/core/siren-core-modules.el @@ -105,6 +105,7 @@ ;; Text editing (require 'siren-beginend) +(require 'siren-cycle-quotes) (require 'siren-expand-region) (require 'siren-insert) (require 'siren-move-dup) @@ -119,7 +120,6 @@ (require 'siren-string-edit) (require 'siren-string-inflection) (require 'siren-toggle-comments) -(require 'siren-toggle-quotes) (require 'siren-yasnippet) ;; Version control diff --git a/modules/languages/siren-ruby.el b/modules/languages/siren-ruby.el index 244804d..d052747 100644 --- a/modules/languages/siren-ruby.el +++ b/modules/languages/siren-ruby.el @@ -11,7 +11,7 @@ (require 'siren-lsp) (require 'siren-projectile) (require 'siren-string-inflection) -(require 'siren-toggle-quotes) +(require 'siren-cycle-quotes) (require 'siren-tree-sitter) (use-package ruby-mode @@ -203,7 +203,7 @@ :diminish ruby-tools-mode :general (:keymaps 'ruby-tools-mode-map - "C-'" 'toggle-quotes) + "C-'" 'cycle-quotes) :hook (ruby-mode . ruby-tools-mode) diff --git a/modules/text-editing/siren-cycle-quotes.el b/modules/text-editing/siren-cycle-quotes.el new file mode 100644 index 0000000..5d67e56 --- /dev/null +++ b/modules/text-editing/siren-cycle-quotes.el @@ -0,0 +1,14 @@ +;;; siren-cycle-quotes.el --- jimeh's Emacs Siren: cycle-quotes. + +;;; Commentary: + +;; Basic configuration of cycle-quotes. + +;;; Code: + +(use-package cycle-quotes + :general + ("C-'" 'cycle-quotes)) + +(provide 'siren-cycle-quotes) +;;; siren-cycle-quotes.el ends here diff --git a/straight/versions/default.el b/straight/versions/default.el index d15b815..7fbf360 100644 --- a/straight/versions/default.el +++ b/straight/versions/default.el @@ -25,6 +25,7 @@ ("consult-lsp" . "19606a03cf854e1b0930c4526ed92c4560dccdc2") ("copilot.el" . "9b13478720581580a045ac76ad68be075466a963") ("cucumber.el" . "e204d9e204b767cf95d6a051ff283f05dc51e9d3") + ("cycle-quotes" . "14912c379f324483775e5dd1e45b866482fe4ba3") ("dap-mode" . "31f92f678cc0c2404bb2a9e6af7113dc73f11d27") ("dart-mode" . "43975c92080e307c4bc14a4773a61195d2062fd9") ("dash-at-point" . "fba1a6f42ea51d05110e12c62bdced664059eb55") @@ -207,7 +208,6 @@ ("terraform-mode" . "e560caaa9d9a11b0868adf6d9dcae5ebb5055730") ("themes" . "d79a41f593c69697af1ddaac971c0c47ecc446a8") ("tide" . "96bfc5da11a9b83b32368c38e933a405270652de") - ("toggle-quotes.el" . "33abc221d6887f0518337851318065cd86c34b03") ("transient" . "cc887ebe3fa85a3642d937efe2ff882b356da9c0") ("tree-sitter-langs" . "deb2d8674be8f777ace50e15c7c041aeddb1d0b2") ("treemacs" . "1a2609425d36d679d49481b7307240145457305c")