From 72443f6b699935d774c37b9e7a68eed54c5b8df7 Mon Sep 17 00:00:00 2001 From: Josh Goebel Date: Wed, 17 Mar 2021 03:12:24 -0400 Subject: [PATCH] fix(python) allow keywords immediately following numbers Progress on #2985. --- CHANGES.md | 1 + src/languages/python.js | 1 + test/markup/python/keywords.expect.txt | 3 +++ test/markup/python/keywords.txt | 3 +++ 4 files changed, 8 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 3b980b62ab..a6abc3b73b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -12,6 +12,7 @@ New Languages: Language grammar improvements: +- fix(python) allow keywords immediately following numbers (#2985) [Josh Goebel][] - fix(xml) char immediately following tag close mis-highlighted (#3044) [Josh Goebel][] - fix(ruby) fix `defined?()` mis-highlighted as `def` (#3025) [Josh Goebel][] - fix(c) comments after `#include ` blocks (#3041) [Josh Goebel][] diff --git a/src/languages/python.js b/src/languages/python.js index 53bbd4727a..ea765f4651 100644 --- a/src/languages/python.js +++ b/src/languages/python.js @@ -144,6 +144,7 @@ export default function(hljs) { ]; const KEYWORDS = { + $pattern: /[A-Za-z]\w+|__\w+__/, keyword: RESERVED_WORDS, built_in: BUILT_INS, literal: LITERALS, diff --git a/test/markup/python/keywords.expect.txt b/test/markup/python/keywords.expect.txt index 4be7620172..96aa34ebff 100644 --- a/test/markup/python/keywords.expect.txt +++ b/test/markup/python/keywords.expect.txt @@ -12,3 +12,6 @@ x = Shorty() print(_) exec(123) + +# note, numbers still aren't highlighted fully +print(1if 0==0else"b") diff --git a/test/markup/python/keywords.txt b/test/markup/python/keywords.txt index 53dfb203ca..0b7835526d 100644 --- a/test/markup/python/keywords.txt +++ b/test/markup/python/keywords.txt @@ -12,3 +12,6 @@ for _ in sys.path: print(_) exec(123) + +# note, numbers still aren't highlighted fully +print(1if 0==0else"b")