From: Jim Porter <jporterbugs@gmail.com>
Date: Wed, 12 May 2021 08:47:07 +0000 (+0200)
Subject: Abbreviate rgrep command on MS Windows (bug#48302)
X-Git-Tag: emacs-28.0.90~2505
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d2034296a906bf444472c02b958dba21cbaae762;p=emacs.git

Abbreviate rgrep command on MS Windows (bug#48302)

* lisp/progmodes/grep.el (grep-mode-font-lock-keywords):
Adapt regexp to match MS Windows-style shell-quoting.

* test/lisp/progmodes/grep-tests.el: New file.
---

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index e9fbcbbfcd0..80c3e7840f0 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -473,7 +473,7 @@ buffer `default-directory'."
       (1 (if (eq (char-after (match-beginning 1)) ?\0)
              `(face nil display ,(match-string 2)))))
      ;; Hide excessive part of rgrep command
-     ("^find \\(\\. -type d .*\\\\)\\)"
+     ("^find \\(\\. -type d .*\\(?:\\\\)\\|\")\"\\)\\)"
       (1 (if grep-find-abbreviate grep-find-abbreviate-properties
            '(face nil abbreviated-command t))))
      ;; Hide excessive part of lgrep command
diff --git a/test/lisp/progmodes/grep-tests.el b/test/lisp/progmodes/grep-tests.el
new file mode 100644
index 00000000000..205982238f2
--- /dev/null
+++ b/test/lisp/progmodes/grep-tests.el
@@ -0,0 +1,69 @@
+;;; grep-tests.el --- Test suite for grep.el  -*- lexical-binding:t -*-
+
+;; Copyright (C) 2021 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'ert)
+(require 'grep)
+
+(defconst grep-tests--ellipsis (if (char-displayable-p ?…) "[…]" "[...]")
+  "The form that the ellipsis takes in `grep-find-abbreviate-properties'.")
+
+(defun grep-tests--get-rgrep-abbreviation ()
+  "Get the `display' property of the excessive part of the rgrep command."
+  (with-temp-buffer
+    (grep-compute-defaults)
+    (insert (rgrep-default-command "search" "*" nil))
+    (grep-mode)
+    (font-lock-mode)
+    (font-lock-ensure)
+    (goto-char (point-min))
+    (re-search-forward "find ")
+    (get-text-property (point) 'display)))
+
+(defun grep-tests--check-rgrep-abbreviation ()
+  "Check that the excessive part of the rgrep command is abbreviated iff
+`grep-find-abbreviate' is non-nil."
+  (let ((grep-find-abbreviate t))
+    (should (equal (grep-tests--get-rgrep-abbreviation)
+                   grep-tests--ellipsis)))
+  (let ((grep-find-abbreviate nil))
+    (should-not (grep-tests--get-rgrep-abbreviation))))
+
+(ert-deftest grep-tests--rgrep-abbreviate-properties-gnu-linux ()
+  (let ((system-type 'gnu/linux))
+    (grep-tests--check-rgrep-abbreviation)))
+
+(ert-deftest grep-tests--rgrep-abbreviate-properties-darwin ()
+  (let ((system-type 'darwin))
+    (grep-tests--check-rgrep-abbreviation)))
+
+(ert-deftest grep-tests--rgrep-abbreviate-properties-windows-nt-dos-semantics ()
+  (let ((system-type 'windows-nt))
+    (cl-letf (((symbol-function 'w32-shell-dos-semantics) #'always))
+      (grep-tests--check-rgrep-abbreviation))))
+
+(ert-deftest grep-tests--rgrep-abbreviate-properties-windows-nt-sh-semantics ()
+  (let ((system-type 'windows-nt))
+    (cl-letf (((symbol-function 'w32-shell-dos-semantics) #'ignore))
+      (grep-tests--check-rgrep-abbreviation))))
+
+;;; grep-tests.el ends here