martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve python-ts-mode fontification (bug#59534)

Browse Source 
* lisp/progmodes/python.el (python--treesit-operators): Add operators.
(python--treesit-fontify-string): Fontify BOF docstrings.
This commit is contained in:
Yuan Fu
2022-11-24 10:18:14 -08:00
parent 55f6f1c82a
commit fc9d7b3d04
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lisp/progmodes/python.el
View File

@@ -988,7 +988,7 @@ It makes underscores and dots word constituent chars.")
(defvar python--treesit-operators
'("-" "-=" "!=" "*" "**" "**=" "*=" "/" "//" "//=" "/=" "&" "%" "%="
"^" "+" "+=" "<" "<<" "<=" "<>" "=" "==" ">" ">=" ">>" "|" "~"))
"^" "+" "+=" "<" "<<" "<=" "<>" "=" "==" ">" ">=" ">>" "|" "~" "@" "@="))
(defvar python--treesit-special-attributes
'("__annotations__" "__closure__" "__code__"
@@ -1033,12 +1033,27 @@ fontified."
(let* ((string-beg (treesit-node-start node))
(string-end (treesit-node-end node))
(maybe-expression (treesit-node-parent node))
(maybe-defun (treesit-node-parent
(grandparent (treesit-node-parent
(treesit-node-parent
maybe-expression)))
(face (if (and (member (treesit-node-type maybe-defun)
'("function_definition"
"class_definition"))
(maybe-defun grandparent)
(face (if (and (or (member (treesit-node-type maybe-defun)
'("function_definition"
"class_definition"))
;; If the grandparent is null, meaning the
;; string is top-level, and the string has
;; no node or only comment preceding it,
;; it's a BOF docstring.
(and (null grandparent)
(cl-loop
for prev = (treesit-node-prev-sibling
maybe-expression)
then (treesit-node-prev-sibling prev)
while prev
if (not (equal (treesit-node-type prev)
"comment"))
return nil
finally return t)))
;; This check filters out this case:
;; def function():
;; return "some string"