From fa00d2bfe86c9aa938a4b41978a0ddf73986f2bc Mon Sep 17 00:00:00 2001
From: Bill Keese <wkeese@jp.ibm.com>
Date: Wed, 4 Oct 2023 07:22:19 +0900
Subject: [PATCH] Remove spaces from regexps in anticipation of identical
 change on https://github.com/scriptcoded/sql-highlight/pull/141.

---
 lib/index.js | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 17a3a05..ac012e2 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-regex-spaces */
 'use strict'
 
 const keywords = require('./keywords')
@@ -21,37 +20,32 @@ const DEFAULT_OPTIONS = {
 }
 
 const highlighters = [
-  /\b(?<number>  \d+ (?:\.\d+)?  )\b/,
+  /\b(?<number>\d+(?:\.\d+)?)\b/,
 
   // Note: Repeating string escapes like 'sql''server' will also work as they are just repeating strings
-  /(?<string>  '(?: [^'\\] | \\. )*'  |  "(?: [^"\\] | \\. )*" )/,
+  /(?<string>'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")/,
 
-  /(?<comment>  --[^\n\r]*  |  #[^\n\r]*  |  \/\*  (?: [^*] | \* (?!\/) )* \*\/  )/,
+  /(?<comment>--[^\n\r]*|#[^\n\r]*|\/\*(?:[^*]|\*(?!\/))*\*\/)/,
 
   // Future improvement: Comments should be allowed between the function name and the opening parenthesis
-  /\b(?<function> \w+ ) (?= \s*\( )/,
+  /\b(?<function>\w+)(?=\s*\()/,
 
-  /(?<bracket> [()] )/,
+  /(?<bracket>[()])/,
 
-  /(?<special> != | [=%*/\-+,;:<>.] )/,
+  /(?<special>!=|[=%*/\-+,;:<>.])/,
 
-  /(?<identifier> \b\w+\b | `(?: [^`\\] | \\. )*`)/,
+  /(?<identifier>\b\w+\b|`(?:[^`\\]|\\.)*`)/,
 
-  /(?<whitespace> \s+ )/,
+  /(?<whitespace>\s+)/,
 
-  /(?<unknown> \.+? )/
+  /(?<unknown>\.+?)/
 ]
 
-function getRegexString (regex) {
-  const str = regex.toString()
-  return str.replace(/^\/|\/\w*$|[\t ]+/g, '')
-}
-
 // Regex of the shape /((?<token1>...)|(?<token2>...)|...|$)/g
 const tokenizer = new RegExp(
   '(' +
   '\\b(?<keyword>' + keywords.join('|') + ')\\b|' +
-  highlighters.map(getRegexString).join('|') +
+  highlighters.map(regex => regex.source).join('|') +
   ')',
   'gis'
 )