emacs-elpa-diffs
[Top][All Lists]
Advanced

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

[elpa] externals/company 613541e: company-gtags: Support annotation with


From: ELPA Syncer
Subject: [elpa] externals/company 613541e: company-gtags: Support annotation with multiline args
Date: Fri, 26 Mar 2021 17:57:07 -0400 (EDT)

branch: externals/company
commit 613541e048916986e7cd464b054e72e84d96efd1
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>

    company-gtags: Support annotation with multiline args
    
    Fixes #1075
---
 company-gtags.el    | 5 ++++-
 test/gtags-tests.el | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/company-gtags.el b/company-gtags.el
index d9713d0..1d9df5f 100644
--- a/company-gtags.el
+++ b/company-gtags.el
@@ -121,7 +121,10 @@ completion."
         (let ((start (match-end 0)))
           (insert meta)
           (goto-char start)
-          (forward-sexp)
+          (condition-case nil
+              (forward-sexp)
+            (scan-error
+             (goto-char (point-max))))
           (buffer-substring-no-properties
            start (point)))))))
 
diff --git a/test/gtags-tests.el b/test/gtags-tests.el
index 7dfd77e..57873b8 100644
--- a/test/gtags-tests.el
+++ b/test/gtags-tests.el
@@ -60,3 +60,9 @@
               'meta "static void test(void (*foo)(void (*bar)(void)))")))
     (should (equal (company-gtags 'annotation str)
                    "(void (*foo)(void (*bar)(void)))"))))
+
+(ert-deftest company-gtags-C-function-multiline-args ()
+  (let ((str (propertize
+              "munmap"
+              'meta "void munmap(")))
+    (should (equal (company-gtags 'annotation str) "(" ))))



reply via email to

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