From b067595576b32b795af333594e19076c38a0bde4 Mon Sep 17 00:00:00 2001
From: Tomas Machalek <tomas.machalek@gmail.com>
Date: Thu, 9 Jan 2020 14:01:52 +0100
Subject: [PATCH] Fix additional cql char escaping and syntax highlighter supp.

---
 public/files/js/models/wordlist/main.ts | 2 +-
 scripts/build/cql.pegjs                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/files/js/models/wordlist/main.ts b/public/files/js/models/wordlist/main.ts
index ee05e52882..a1d9d59553 100644
--- a/public/files/js/models/wordlist/main.ts
+++ b/public/files/js/models/wordlist/main.ts
@@ -241,7 +241,7 @@ export class WordlistResultModel extends StatefulModel {
     }
 
     private createPQuery(s:string):string {
-        return `[${this.formModel.getState().wlattr}="${s.replace(/([.?+*\[\]{}])/g, '\\$1')}"]`;
+        return `[${this.formModel.getState().wlattr}="${s.replace(/([.?+*\[\]{}$^|])/g, '\\$1')}"]`;
     }
 
     private processPageLoad(skipHistory=false):void {
diff --git a/scripts/build/cql.pegjs b/scripts/build/cql.pegjs
index 3eea3ea386..500f0c62b8 100644
--- a/scripts/build/cql.pegjs
+++ b/scripts/build/cql.pegjs
@@ -132,7 +132,7 @@ RG_OP =
     [,\-_\^ ] / [0-9\?\*\+\.\|]
 
 RG_ESCAPED =
-    '\\{' / '\\}' / '\\(' / '\\)' / '\\[' / '\\]' / '\\?' / '\\!' / '\\.' / '\\"' / '\\*' / '\\+'
+    '\\{' / '\\}' / '\\(' / '\\)' / '\\[' / '\\]' / '\\?' / '\\!' / '\\.' / '\\"' / '\\*' / '\\+' / '\\^' / '\\$' / '\\|'
 
 // {n}, {n,}, {n,m}
 RgRange =