wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-23 21:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ace: Add support for multiline strings

Browse source 
In the AF language,
```
foo := "abc
   def"
```

declares a valid string with a linebreak inside. This wasn't previously
highlighted by ace, since normal rules are scanned line-by-line. The
code added here is essentially copied from the PHP highlighter [1],
whose rules should be almost the same as AF.

This new syntax also highlights escape sequences inside strings, e.g. in
"foo\\bar" see how the backslashes have a different color.

[1] - https://github.com/ajaxorg/ace/blob/master/lib/ace/mode/php_highlight_rules.js#L1058

Change-Id: Idb51001af00ff2ef118741cd686dc1adf19aebee
This commit is contained in:
Daimona Eaytoy 2021-10-02 17:15:15 +02:00
parent 0dae59616c
commit 1b41a61cf2
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
modules/mode-abusefilter.js
View file

@ -36,9 +36,7 @@ ace.define( 'ace/mode/abusefilter_highlight_rules', [ 'require', 'exports', 'mod
fraction = '(?:\\.\\d+)',
intPart = '(?:\\d+)',
pointFloat = '(?:(?:' + intPart + '?' + fraction + ')|(?:' + intPart + '\\.))',
floatNumber = '(?:' + pointFloat + ')',
singleQuoteString = '\'(?:[^\\\\]|\\\\.)*?\'',
doubleQuoteString = '"(?:[^\\\\]|\\\\.)*?"';
floatNumber = '(?:' + pointFloat + ')';
this.$rules = {
start: [ {
@ -47,10 +45,12 @@ ace.define( 'ace/mode/abusefilter_highlight_rules', [ 'require', 'exports', 'mod
next: 'comment'
}, {
token: 'string',
regex: doubleQuoteString
regex: '"',
next: 'doublequotestring'
}, {
token: 'string',
regex: singleQuoteString
regex: "'",
next: 'singlequotestring'
}, {
token: 'constant.numeric',
regex: floatNumber
@ -73,13 +73,20 @@ ace.define( 'ace/mode/abusefilter_highlight_rules', [ 'require', 'exports', 'mod
token: 'text',
regex: '\\s+|\\w+'
} ],
comment: [ {
token: 'comment',
regex: '\\*\\/',
next: 'start'
}, {
defaultToken: 'comment'
} ]
comment: [
{ token: 'comment', regex: '\\*\\/', next: 'start' },
{ defaultToken: 'comment' }
],
doublequotestring: [
{ token: 'constant.language.escape', regex: /\\["\\]/ },
{ token: 'string', regex: '"', next: 'start' },
{ defaultToken: 'string' }
],
singlequotestring: [
{ token: 'constant.language.escape', regex: /\\['\\]/ },
{ token: 'string', regex: "'", next: 'start' },
{ defaultToken: 'string' }
]
};
this.normalizeRules();