branch: elpa/flycheck
commit 8bc9035f35b6ece750bdf36b4e05b329449b8eb1
Author: Bozhidar Batsov <[email protected]>
Commit: Bozhidar Batsov <[email protected]>

    Add specs and changelog entries for recently merged PRs
    
    Covers the wrap-prefix composition [#2175], the Chicken
    unresolved-identifier patterns [#2164] and the lintr named-argument fix
    [#1946].  Also smooth out the grammar in the lintr option docstring.
---
 CHANGES.rst                 |  7 +++++++
 flycheck.el                 |  5 +++--
 test/specs/test-overlays.el | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 251a583f17..518729b994 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,6 +8,13 @@
   passing a broken ``-x`` flag in ``haskell-ts-mode``.
 - [#2177]: Avoid ``\N{...}`` character escapes, which break native
   compilation on Emacs 32.
+- [#2175]: Compose the error indicator with pre-existing ``wrap-prefix``
+  text properties (e.g. from ``visual-wrap-prefix-mode``), so error
+  overlays no longer reset the indentation of soft-wrapped lines.
+- [#2164]: Recognize unresolved-identifier errors in the
+  ``scheme-chicken`` checker.
+- [#1946]: Fix ``flycheck-lintr-linters`` being ignored by recent lintr
+  versions, which require linters to be passed as a named argument.
 - Add ``asciidoc-mode`` support to the ``asciidoctor`` and ``textlint``
   checkers, alongside the existing ``adoc-mode``.
 - Add ``neocaml-opam-mode`` support to the ``opam`` checker.
diff --git a/flycheck.el b/flycheck.el
index ccddb51979..e82aa09191 100644
--- a/flycheck.el
+++ b/flycheck.el
@@ -11016,8 +11016,9 @@ disables caching in case there are problems."
 (flycheck-def-option-var flycheck-lintr-linters "default_linters" r-lintr
   "Linters to use with lintr.
 
-The value of this variable is a string which is the argument `linters = `
-passing to the lintr::lint() function,"
+The value of this variable is a string containing an R
+expression, passed as the `linters' argument to the
+lintr::lint() function."
   :type 'string
   :risky t
   :package-version '(flycheck . "0.23"))
diff --git a/test/specs/test-overlays.el b/test/specs/test-overlays.el
index 8109268d56..b955f2b35f 100644
--- a/test/specs/test-overlays.el
+++ b/test/specs/test-overlays.el
@@ -116,6 +116,24 @@
               (expect (overlay-get overlay 'before-string)
                       :not :to-be-truthy))))))
 
+    (it "preserves existing line-prefix text properties"
+      (flycheck-buttercup-with-temp-buffer
+        (insert "Hello world")
+        (put-text-property 1 6 'line-prefix "  ")
+        (let ((overlay (flycheck-add-overlay
+                        (flycheck-error-new-at 1 1 'error))))
+          (expect (overlay-get overlay 'line-prefix) :to-equal "  "))))
+
+    (it "composes existing wrap-prefix text properties with the indicator"
+      (flycheck-buttercup-with-temp-buffer
+        (insert "Hello world")
+        (put-text-property 1 6 'wrap-prefix "  ")
+        (let ((wrap-prefix (overlay-get (flycheck-add-overlay
+                                         (flycheck-error-new-at 1 1 'error))
+                                        'wrap-prefix)))
+          (expect (stringp wrap-prefix) :to-be-truthy)
+          (expect (substring wrap-prefix -2) :to-equal "  "))))
+
     (it "has an info fringe icon"
       (flycheck-buttercup-with-temp-buffer
         (insert "Hello\n    World")

Reply via email to