fix(python) fix or conflicts with string highlighting (#3897)

Co-authored-by: Josh Goebel <me@joshgoebel.com>
highlightjs · Nov 8, 2023 · 5bb7114 · 5bb7114
1 parent 3270ef9
commit 5bb7114
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -7,6 +7,7 @@ Core Grammars:
 - fix(rust) fix escaped double quotes in string  [Mohamed Ali][]
 - fix(yaml) fix for yaml with keys having brackets highlighted incorrectly [Aneesh Kulkarni][]
 - fix(bash) fix # within token being detected as the start of a comment [Felix Uhl][]
+- fix(python) fix `or` conflicts with string highlighting [Mohamed Ali][]
 
 New Grammars:
 

diff --git a/src/languages/python.js b/src/languages/python.js
@@ -381,6 +381,7 @@ export default function(hljs) {
         beginKeywords: "if",
         relevance: 0
       },
+      { match: /\bor\b/, scope: "keyword" },
       STRING,
       COMMENT_TYPE,
       hljs.HASH_COMMENT_MODE,

diff --git a/test/markup/python/f-strings.expect.txt b/test/markup/python/f-strings.expect.txt
@@ -11,3 +11,26 @@
 <span class="hljs-string">f&quot;{{ }}&quot;</span>
 <span class="hljs-keyword">if</span><span class="hljs-string">&quot;text&quot;</span>==<span class="hljs-string">&quot;text&quot;</span>:
     <span class="hljs-string">&quot;good&quot;</span>
+<span class="hljs-string">rf&quot;https://www.<span class="hljs-subst">{domain}</span>.com&quot;</span>
+<span class="hljs-meta">&gt;&gt;&gt; </span><span class="hljs-string">fr&quot;&quot;&quot;
+<span class="hljs-meta">... </span>https://www.example.com/{{age}/360}
+...
+&quot;&quot;&quot;</span>
+<span class="hljs-string">br&quot;https://&quot;</span>
+<span class="hljs-keyword">or</span> <span class="hljs-string">br&quot;https://&quot;</span>
+<span class="hljs-string">rb&quot;https://&quot;</span>
+<span class="hljs-keyword">or</span> <span class="hljs-string">rb&quot;https://&quot;</span>
+test()<span class="hljs-keyword">or</span><span class="hljs-string">&quot;&quot;</span>
+
+<span class="hljs-string">&quot;my ...
+... name&quot;</span>
+<span class="hljs-meta">&gt;&gt;&gt; </span><span class="hljs-string">&quot;my ...
+... name&quot;</span>
+
+<span class="hljs-built_in">print</span>(<span class="hljs-string">&quot;kkds&quot;</span>+<span class="hljs-string">&quot;kdjsa&quot;</span>)
+<span class="hljs-built_in">print</span>(<span class="hljs-string">&quot;kkds&quot;</span>+<span class="hljs-string">b&quot;kdjsa&quot;</span>)
+<span class="hljs-built_in">print</span>(test()<span class="hljs-keyword">or</span><span class="hljs-string">&quot;kdjs&quot;</span>)
+<span class="hljs-built_in">print</span>(test()<span class="hljs-keyword">or</span> <span class="hljs-string">&quot;kdjs&quot;</span>)
+<span class="hljs-built_in">print</span>(test()<span class="hljs-keyword">or</span> <span class="hljs-string">f&quot;kdjs&quot;</span>)
+test()<span class="hljs-keyword">or</span><span class="hljs-string">&quot;me&quot;</span>
+<span class="hljs-built_in">print</span>(test()<span class="hljs-keyword">or</span><span class="hljs-string">&quot;me&quot;</span>)
diff --git a/test/markup/python/f-strings.txt b/test/markup/python/f-strings.txt
@@ -11,3 +11,26 @@ f"{name + f'{name}'}"
 f"{{ }}"
 if"text"=="text":
     "good"
+rf"https://www.{domain}.com"
+>>> fr"""
+... https://www.example.com/{{age}/360}
+...
+"""
+br"https://"
+or br"https://"
+rb"https://"
+or rb"https://"
+test()or""
+
+"my ...
+... name"
+>>> "my ...
+... name"
+
+print("kkds"+"kdjsa")
+print("kkds"+b"kdjsa")
+print(test()or"kdjs")
+print(test()or "kdjs")
+print(test()or f"kdjs")
+test()or"me"
+print(test()or"me")