Commit 0a7e8d60 authored by immerrr's avatar immerrr

cython-mode.el: don't highlight builtins when they're part of varname

To avoid mismatches keywords should be checked at symbol, not word
boundaries, otherwise they'll ignore underscores (is_*float*).
parent 3d6f0126
...@@ -47,19 +47,23 @@ ...@@ -47,19 +47,23 @@
(defvar cython-font-lock-keywords (defvar cython-font-lock-keywords
`(;; new keywords in Cython language `(;; new keywords in Cython language
(,(regexp-opt '("by" "cdef" "cimport" "cpdef" "ctypedef" "enum" "except?" (,(rx symbol-start
(or "by" "cdef" "cimport" "cpdef" "ctypedef" "enum" "except?"
"extern" "gil" "include" "nogil" "property" "public" "extern" "gil" "include" "nogil" "property" "public"
"readonly" "struct" "union" "DEF" "IF" "ELIF" "ELSE") 'words) "readonly" "struct" "union" "DEF" "IF" "ELIF" "ELSE")
symbol-end)
1 font-lock-keyword-face) 1 font-lock-keyword-face)
;; C and Python types (highlight as builtins) ;; C and Python types (highlight as builtins)
(,(regexp-opt '("NULL" "bint" "char" "dict" "double" "float" "int" "list" (,(rx symbol-start
"long" "object" "Py_ssize_t" "short" "size_t" "void") 'words) (or "NULL" "bint" "char" "dict" "double" "float" "int" "list"
"long" "object" "Py_ssize_t" "short" "size_t" "void")
symbol-end)
1 font-lock-builtin-face) 1 font-lock-builtin-face)
;; cdef is used for more than functions, so simply highlighting the next ;; cdef is used for more than functions, so simply highlighting the next
;; word is problematic. struct, enum and property work though. ;; word is problematic. struct, enum and property work though.
("\\<\\(?:struct\\|enum\\)[ \t]+\\([a-zA-Z_]+[a-zA-Z0-9_]*\\)" ("\\_<\\(?:struct\\|enum\\)[ \t]+\\([a-zA-Z_]+[a-zA-Z0-9_]*\\)"
1 py-class-name-face) 1 py-class-name-face)
("\\<property[ \t]+\\([a-zA-Z_]+[a-zA-Z0-9_]*\\)" ("\\_<property[ \t]+\\([a-zA-Z_]+[a-zA-Z0-9_]*\\)"
1 font-lock-function-name-face)) 1 font-lock-function-name-face))
"Additional font lock keywords for Cython mode.") "Additional font lock keywords for Cython mode.")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment