Fix faulty regex for syntax highlighter (#1723)

* Fix faulty regex * fix regex properly, removing extra *s * add tests --------- Co-authored-by: notmeegoreng <[email protected]>
source-academy · Oct 2, 2024 · 883ffe7 · 883ffe7
1 parent f6ea571
commit 883ffe7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/__tests__/mode.ts b/src/__tests__/mode.ts
@@ -79,7 +79,7 @@ test('constants are not correctly loaded', () => {
 })
 
 test('operator syntax type error', () => {
-  const code = 'const num = 3; \nnum++; \nnum--; \nnum += 1;'
+  const code = 'const num = 3; \nnum++; \nnum--; \nnum += 1; \n5 + num |2;'
 
   setSession(Chapter.SOURCE_1, defaultVariant, defaultExternal, code)
 
@@ -91,6 +91,15 @@ test('operator syntax type error', () => {
 
   const token3 = session.getTokenAt(3, 5)
   expect(expectedBool(token3, CATEGORY.forbidden)).toBe(true)
+
+  const token4 = session.getTokenAt(4, 1)
+  expect(expectedBool(token4, CATEGORY.number)).toBe(true)
+
+  const token5 = session.getTokenAt(4, 9)
+  expect(expectedBool(token5, CATEGORY.forbidden)).toBe(true)
+
+  const token6 = session.getTokenAt(4, 10)
+  expect(expectedBool(token6, CATEGORY.number)).toBe(true)
 })
 
 test('forbidden keywords', () => {

diff --git a/src/editors/ace/modes/source.ts b/src/editors/ace/modes/source.ts
@@ -113,9 +113,9 @@ export function HighlightRulesSelector(
     const VariantForbiddenRegexSelector = () => {
       if (variant === Variant.TYPED) {
         // Removes the part of the regex that highlights singular |, since Typed variant uses union types
-        return /\.{3}|--+|\+\++|\^|(==|!=)[^=]|[$%&*+\-~\/^]=+|[^&]*&[^&]/
+        return /\.{3}|--+|\+\++|\^|(==|!=)[^=]|[$%&*+\-~\/^]=+|(?<!&)&(?!&)/
       }
-      return /\.{3}|--+|\+\++|\^|(==|!=)[^=]|[$%&*+\-~\/^]=+|[^&]*&[^&]|[^\|]*\|[^\|]/
+      return /\.{3}|--+|\+\++|\^|(==|!=)[^=]|[$%&*+\-~\/^]=+|(?<!&)&(?!&)|(?<!\|)\|(?!\|)/
     }
 
     // @ts-ignore