emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 103ebbf92f3: Make eglot--clangd-version more robust


From: Robert Pluim
Subject: master 103ebbf92f3: Make eglot--clangd-version more robust
Date: Wed, 22 Mar 2023 07:51:05 -0400 (EDT)

branch: master
commit 103ebbf92f375cc6f44a2b49c85fbe3a6b1704d4
Author: Robert Pluim <rpluim@gmail.com>
Commit: Robert Pluim <rpluim@gmail.com>

    Make eglot--clangd-version more robust
    
    * test/lisp/progmodes/eglot-tests.el (eglot--clangd-version): Check
    for 'version ' followed by a combination of numbers and dots to
    extract the clangd version.
---
 test/lisp/progmodes/eglot-tests.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/lisp/progmodes/eglot-tests.el 
b/test/lisp/progmodes/eglot-tests.el
index c4b23bfd64e..71d9d7270dd 100644
--- a/test/lisp/progmodes/eglot-tests.el
+++ b/test/lisp/progmodes/eglot-tests.el
@@ -316,9 +316,10 @@ then restored."
 
 (defun eglot--clangd-version ()
   "Report on the clangd version used in various tests."
-  (replace-regexp-in-string
-   ".*version[[:space:]]+\\(.*\\)" "\\1"
-   (car (split-string (shell-command-to-string "clangd --version") "\n"))))
+  (let ((version (shell-command-to-string "clangd --version")))
+    (when (string-match "version[[:space:]]+\\([0-9.]*\\)"
+                        version)
+      (match-string 1 version))))
 
 
 ;;; Unit tests



reply via email to

[Prev in Thread] Current Thread [Next in Thread]