From 30cad31c43956aa33d45650b505aa6d634534d59 Mon Sep 17 00:00:00 2001 From: Renke Christian von Seggern Date: Tue, 17 Jan 2023 17:39:34 +0100 Subject: [PATCH 1/2] [Fix #537] Fail early in cljr-rename-symbol if narrowing is in effect Previously the function would report a successful renaming without actually having renamed anything. --- CHANGELOG.md | 2 ++ clj-refactor.el | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54c2259a..70678b1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +- [#537](https://github.com/clojure-emacs/clj-refactor.el/issues/537): Fail early in `cljr-rename-symbol` in case narrowing is in effect. + ## 3.6.1 - Add the [clojure.math namespace](https://clojure.github.io/clojure/clojure.math-api.html) to magic requires (new with Clojure 1.11.0) diff --git a/clj-refactor.el b/clj-refactor.el index f669c4f4..4ecfc8f4 100644 --- a/clj-refactor.el +++ b/clj-refactor.el @@ -2827,6 +2827,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-find-usages" See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-rename-symbol" (interactive) + (if (buffer-narrowed-p) (error "Cannot rename symbols while narrowing is in effect")) (cljr--ensure-op-supported "find-symbol") (when (cljr--asts-y-or-n-p) (save-buffer) From 456b8aa06c09fea50164e3c321781678334ee9e7 Mon Sep 17 00:00:00 2001 From: Renke Christian von Seggern Date: Fri, 20 Jan 2023 08:01:56 +0100 Subject: [PATCH 2/2] [Fix #537] Use "when" instead of "if" Otherwise the linter will complain about the "if" missing its "else" branch. --- clj-refactor.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clj-refactor.el b/clj-refactor.el index 4ecfc8f4..e42969a4 100644 --- a/clj-refactor.el +++ b/clj-refactor.el @@ -2827,7 +2827,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-find-usages" See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-rename-symbol" (interactive) - (if (buffer-narrowed-p) (error "Cannot rename symbols while narrowing is in effect")) + (when (buffer-narrowed-p) (error "Cannot rename symbols while narrowing is in effect")) (cljr--ensure-op-supported "find-symbol") (when (cljr--asts-y-or-n-p) (save-buffer)