Merge pull request #2934 from tomachalek/supp1811_b

Fix additional cql char escaping and syntax highlighter supp.
czcorpus · Jan 9, 2020 · 553d17a · 553d17a
2 parents 119f440 + b067595
commit 553d17a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -132,7 +132,7 @@ RG_OP =
     [,\-_\^ ] / [0-9\?\*\+\.\|]
 
 RG_ESCAPED =
-    '\\{' / '\\}' / '\\(' / '\\)' / '\\[' / '\\]' / '\\?' / '\\!' / '\\.' / '\\"' / '\\*' / '\\+'
+    '\\{' / '\\}' / '\\(' / '\\)' / '\\[' / '\\]' / '\\?' / '\\!' / '\\.' / '\\"' / '\\*' / '\\+' / '\\^' / '\\$' / '\\|'
 
 // {n}, {n,}, {n,m}
 RgRange =