Skip to content

Commit 1149f7d

Browse files
authored
Replace obsolete defadvice with add-advice (#4334)
Fixes a number of warnings: Warning: ‘defadvice’ is an obsolete macro (as of 30.1); use ‘advice-add’ or ‘define-advice’
1 parent be36d16 commit 1149f7d

File tree

1 file changed

+19
-15
lines changed

1 file changed

+19
-15
lines changed

lsp-semantic-tokens.el

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -844,33 +844,37 @@ refresh in currently active buffer."
844844
845845
This is a debugging tool, and may incur significant performance penalties."
846846
(setq lsp-semantic-tokens--log '())
847-
(defadvice lsp-semantic-tokens--fontify (around advice-tokens-fontify activate)
847+
(defun lsp-advice-tokens-fontify (orig-func old-fontify-region beg-orig end-orig &optional loudly)
848848
(lsp-semantic-tokens--log-buffer-contents 'before)
849-
(let ((result ad-do-it))
849+
(let ((result (funcall orig-func old-fontify-region beg-orig end-orig loudly)))
850850
(lsp-semantic-tokens--log-buffer-contents 'after)
851851
result))
852-
(defadvice lsp--semantic-tokens-ingest-full/delta-response
853-
(before log-delta-response (response) activate)
852+
(advice-add 'lsp-semantic-tokens--fontify :around 'lsp-advice-tokens-fontify)
853+
854+
(defun lsp-log-delta-response (response)
854855
(setq lsp-semantic-tokens--prev-response `(:request-type "delta"
855856
:response ,response
856857
:version ,lsp--cur-version)))
857-
(defadvice lsp--semantic-tokens-ingest-full-response
858-
(before log-full-response (response) activate)
858+
(advice-add 'lsp--semantic-tokens-ingest-full/delta-response :before 'lsp-log-delta-response)
859+
860+
(defun lsp-log-full-response (response)
859861
(setq lsp-semantic-tokens--prev-response `(:request-type "full"
860-
:response ,response
861-
:version ,lsp--cur-version)))
862-
(defadvice lsp--semantic-tokens-ingest-range-response
863-
(before log-range-response (response) activate)
862+
:response ,response
863+
:version ,lsp--cur-version)))
864+
(advice-add 'lsp--semantic-tokens-ingest-full-response :before 'lsp-log-full-response)
865+
866+
(defun lsp-log-range-response (response)
864867
(setq lsp-semantic-tokens--prev-response `(:request-type "range"
865868
:response ,response
866-
:version ,lsp--cur-version))))
869+
:version ,lsp--cur-version)))
870+
(advice-add 'lsp--semantic-tokens-ingest-range-response :before 'lsp-log-range-response))
867871

868872
(defun lsp-semantic-tokens-disable-log ()
869873
"Disable logging of intermediate fontification states."
870-
(ad-unadvise 'lsp-semantic-tokens--fontify)
871-
(ad-unadvise 'lsp--semantic-tokens-ingest-full/delta-response)
872-
(ad-unadvise 'lsp--semantic-tokens-ingest-full-response)
873-
(ad-unadvise 'lsp--semantic-tokens-ingest-range-response))
874+
(advice-remove 'lsp-semantic-tokens--fontify 'lsp-advice-tokens-fontify)
875+
(advice-remove 'lsp--semantic-tokens-ingest-full/delta-response 'lsp-log-delta-response)
876+
(advice-remove 'lsp--semantic-tokens-ingest-full-response 'lsp-log-full-response)
877+
(advice-remove 'lsp--semantic-tokens-ingest-range-response 'lsp-log-range-response))
874878

875879
(declare-function htmlize-buffer "ext:htmlize")
876880

0 commit comments

Comments
 (0)