From dc76b39b9c2d9cf42fb93c6c96f3b920b69e4e1e Mon Sep 17 00:00:00 2001 From: Rafael Laverde Date: Fri, 2 Dec 2016 11:50:09 -0500 Subject: [PATCH] Improve highlighter decorator regex --- spyder/utils/syntaxhighlighters.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spyder/utils/syntaxhighlighters.py b/spyder/utils/syntaxhighlighters.py index 6c1b202afe6..cd7824a864d 100644 --- a/spyder/utils/syntaxhighlighters.py +++ b/spyder/utils/syntaxhighlighters.py @@ -290,7 +290,9 @@ def make_python_patterns(additional_keywords=[], additional_builtins=[]): kw = r"\b" + any("keyword", kwlist) + r"\b" builtin = r"([^.'\"\\#]\b|^)" + any("builtin", builtinlist) + r"\b" comment = any("comment", [r"#[^\n]*"]) - instance = any("instance", [r"\bself\b",r"^\s*@[a-zA-Z.]*"]) + instance = any("instance", [r"\bself\b", + (r"^\s*@([a-zA-Z_][a-zA-Z0-9_]*)" + r"(.[a-zA-Z_][a-zA-Z0-9_]*)*")]) number = any("number", [r"\b[+-]?[0-9]+[lLjJ]?\b", r"\b[+-]?0[xX][0-9A-Fa-f]+[lL]?\b",