From 35db57ab648438e636c6034b8231df60304ae024 Mon Sep 17 00:00:00 2001 From: Gonzalo Larumbe Date: Mon, 15 May 2023 18:59:21 +0200 Subject: [PATCH] Do not store text properties on workspace tag description for xref --- test/verilog-ext-tests-tags.el | 3333 ++++++++------------------------ verilog-ext-tags.el | 26 +- verilog-ext-xref.el | 5 +- 3 files changed, 858 insertions(+), 2506 deletions(-) diff --git a/test/verilog-ext-tests-tags.el b/test/verilog-ext-tests-tags.el index 737c7d6..cd168ab 100644 --- a/test/verilog-ext-tests-tags.el +++ b/test/verilog-ext-tests-tags.el @@ -84,27 +84,16 @@ Return differences get a better explanation of the errors in ERT testsuites." ;; DANGER: First line should be the correct one, but for some reason I_TEST_IF was detected before I_BLOCK_0 with Emacs in batch mode. ;; The interactive one matches the result if running (verilog-ext-test-tags-defs-file "instances.sv" 'top-items) in an Eshell. ;; ("i" "I_BLOCK0" "I_BLOCK1" "I_BLOCK2" "I_BLOCK3" "I_BLOCK_GEN" "I_TEST_IF" "ITEST_IF_PARAMS" "ITEST_IF_PARAMS_ARRAY" "I_TEST_IF_PARAMS_EMPTY" "I_BLOCK_WS_0" "I_BLOCK_WS_1") - ("i" "I_TEST_IF" "I_BLOCK0" "I_BLOCK1" "I_BLOCK2" "I_BLOCK3" "I_BLOCK_GEN" "ITEST_IF_PARAMS" "ITEST_IF_PARAMS_ARRAY" "I_TEST_IF_PARAMS_EMPTY" "I_BLOCK_WS_0" "I_BLOCK_WS_1") ;; End of DANGER + ("i" "I_TEST_IF" "I_BLOCK0" "I_BLOCK1" "I_BLOCK2" "I_BLOCK3" "I_BLOCK_GEN" "ITEST_IF_PARAMS" "ITEST_IF_PARAMS_ARRAY" "I_TEST_IF_PARAMS_EMPTY" "I_BLOCK_WS_0" "I_BLOCK_WS_1") :locs - ((:type "module" :desc - #("module instances;" 7 16 - (face - (:foreground "goldenrod" :weight bold))) - :file "instances.sv" :line 20))) + ((:type "module" :desc "module instances;" :file "instances.sv" :line 20))) "i" (:items nil :locs - ((:type "genvar" :desc - #("for (genvar i=0; i") - (propertize tag 'face '(:foreground "goldenrod" :weight bold)) - desc - :fixedcase))) - desc-prop)) + (string-trim (buffer-substring-no-properties (line-beginning-position) (line-end-position)))) + (provide 'verilog-ext-tags) diff --git a/verilog-ext-xref.el b/verilog-ext-xref.el index 5825009..f4a072b 100644 --- a/verilog-ext-xref.el +++ b/verilog-ext-xref.el @@ -44,7 +44,10 @@ (setq file (plist-get loc :file)) (setq line (plist-get loc :line)) (setq column nil) - (setq desc (plist-get loc :desc)) + (setq desc (replace-regexp-in-string (concat "\\_<" symbol "\\_>") + (propertize symbol 'face '(:foreground "goldenrod" :weight bold)) + (plist-get loc :desc) + :fixedcase)) (push (xref-make desc (xref-make-file-location file line column)) xref-entries))) xref-entries))