tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-22 13:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Enhance Function List for PHP and JavaScript

Browse Source 
Support interface and trait in PHP.
Support space between function name and opening parenthesis in PHP and JavaScript. Fixes at least #1919 and #2604.

About the JavaScript regex:

Current:
function(\s+[A-Za-z_]?\w*\([^\)\(]*\)|\([^\)\(]*\))

There are 2 parts, for named and anonymous functions. Note there is some duplication, let's simplify it:
function(\s+[A-Za-z_]?\w*)?\([^\)\(]*\)

The first character of function name is not optional (of course when the function is named), let's fix it:
function(\s+[A-Za-z_]\w*)?\([^\)\(]*\)

Finally let's support the possible spaces before opening parenthesis, for both named and anonymous functions:
function(\s+[A-Za-z_]\w*)?\s*\([^\)\(]*\)

Fixes #1919, fixes #2604, fixes #1667, fixes #2962
closes #2523, closes #2621
This commit is contained in:
vlakoff 2016-11-27 10:14:18 +01:00 committed by Don HO
parent 478bb6f241
commit 60b4aa6b75
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PowerEditor/src/functionList.xml
View File

@ -112,12 +112,12 @@
commentExpr="(?s:/\*.*?\*/)|(?m-s://.*?$)" commentExpr="(?s:/\*.*?\*/)|(?m-s://.*?$)"
> >
<classRange <classRange
mainExpr ="^\s*(class|abstract\s+class|final\s+class)[\t\x20]+[A-Za-z_\x7F-\xFF][\w\x7F-\xFF]*(\s*|\s*(extends|implements|(extends\s+(\\|[A-Za-z_\x7F-\xFF][\w\x7F-\xFF]*)+\s+implements))\s+(\,\s*|(\\|[A-Za-z_\x7F-\xFF][\w\x7F-\xFF]*))+\s*)?\{" mainExpr ="^\s*(class|abstract\s+class|final\s+class|interface|trait)[\t\x20]+[A-Za-z_\x7F-\xFF][\w\x7F-\xFF]*(\s*|\s*(extends|implements|(extends\s+(\\|[A-Za-z_\x7F-\xFF][\w\x7F-\xFF]*)+\s+implements))\s+(\,\s*|(\\|[A-Za-z_\x7F-\xFF][\w\x7F-\xFF]*))+\s*)?\{"
openSymbole ="\{" openSymbole ="\{"
closeSymbole="\}" closeSymbole="\}"
> >
<className> <className>
<nameExpr expr="(class|abstract\s+class|final\s+class)\s+\w+" /> <nameExpr expr="(class|abstract\s+class|final\s+class|interface|trait)\s+\w+" />
<nameExpr expr="\s+\w+\Z" /> <nameExpr expr="\s+\w+\Z" />
<nameExpr expr="\w+\Z" /> <nameExpr expr="\w+\Z" />
</className> </className>
@ -132,7 +132,7 @@
</function> </function>
</classRange> </classRange>
<function <function
mainExpr="^\s*function\s+\w+\(" mainExpr="^\s*function\s+\w+\s*\("
> >
<functionName> <functionName>
<nameExpr expr="(?!(if|while|for))\w+\s*\(" /> <nameExpr expr="(?!(if|while|for))\w+\s*\(" />
@ -1167,15 +1167,15 @@
commentExpr="(?s:/\*.*?\*/)|(?m-s://.*?$)" commentExpr="(?s:/\*.*?\*/)|(?m-s://.*?$)"
> >
<function <function
mainExpr="((^|\s+|[;\}\.])([A-Za-z_]\w*\.)*[A-Za-z_]\w*\s*[=:]|^|[\s;\}]+)\s*function(\s+[A-Za-z_]?\w*\([^\)\(]*\)|\([^\)\(]*\))[\n\s]*\{" mainExpr="((^|\s+|[;\}\.])([A-Za-z_$][\w$]*\.)*[A-Za-z_$][\w$]*\s*[=:]|^|[\s;\}]+)\s*function(\s+[A-Za-z_$][\w$]*)?\s*\([^\)\(]*\)[\n\s]*\{"
> >
<functionName> <functionName>
<nameExpr expr="[A-Za-z_]\w*\s*[=:]|[A-Za-z_]?\w*\s*\(" /> <nameExpr expr="[A-Za-z_$][\w$]*\s*[=:]|[A-Za-z_$][\w$]*\s*\(" />
<nameExpr expr="[A-Za-z_]?\w*" /> <nameExpr expr="[A-Za-z_$][\w$]*" />
</functionName> </functionName>
<className> <className>
<nameExpr expr="([A-Za-z_]\w*\.)*[A-Za-z_]\w*\." /> <nameExpr expr="([A-Za-z_$][\w$]*\.)*[A-Za-z_$][\w$]*\." />
<nameExpr expr="([A-Za-z_]\w*\.)*[A-Za-z_]\w*" /> <nameExpr expr="([A-Za-z_$][\w$]*\.)*[A-Za-z_$][\w$]*" />
</className> </className>
</function> </function>
</parser> </parser>