Improvements to keywords highlighting

Fixed all edge cases.

Author: FileEX

web/mta_highlighting/generate-lua-tmlanguage.js

@@ -58,7 +58,7 @@ async function generateTmLanguage() {
 
   if (allKeywords.length > 0) {
     patterns.push({
-      match: `(?<!\\=\\s*)\\b(${allKeywords.join('|')})\\b(?=\\s*\\S)(?!\\s*(=|;|\\(|\\[|\\)|,(?!\u200B)|\\s*--|\\.))`,
+      match: `(?<=\\u200B\\s*)\\b(${allKeywords.join('|')})\\b`,
       name: 'keyword.mta',
     });
   }

web/src/pages/reference/[event].astro

@@ -39,9 +39,11 @@ const eventParameters = event.data.parameters || [];
 let parametersCode = "";
 // Build parameters code syntax e.g. "int param1, string param2"
 if (eventParameters.length > 0) {
+  const ZERO_WIDTH_SPACE = '\u200B';
+
   parametersCode = eventParameters
     .map((param: any) => {
-      return param.type + " " + param.name;
+      return ZERO_WIDTH_SPACE + param.type + " " + param.name;
     })
     .join(", ");
 }

web/src/utils/functions.ts

@@ -31,7 +31,7 @@ function buildSyntaxString(
   const ZERO_WIDTH_SPACE = '\u200B';
 
   const returnString = returns
-    ? `${returns.values.map(v => v.type).join(`,${ZERO_WIDTH_SPACE} `)}`
+    ? `${returns.values.map(v => `${ZERO_WIDTH_SPACE}${v.type}`).join(', ')}`
     : '';
 
   const paramParts: string[] = [];
@@ -44,8 +44,12 @@ function buildSyntaxString(
     }
   };
 
+  const addZWSPToType = (typeStr: string): string => {
+    return typeStr.split(/(?:\/|\|)/).map(t => `${ZERO_WIDTH_SPACE}${t.trim()}`).join(typeStr.includes('|') ? '|' : '/');
+  };
+
   for (const p of parameters) {
-    const str = `${p.type} ${p.name}${p.default !== undefined ? ` = ${p.default}` : ''}`;
+    const str = `${addZWSPToType(p.type)} ${p.name}${p.default !== undefined ? ` = ${p.default}` : ''}`;
 
     if (p.default !== undefined) {
       optionalGroup.push(str);