diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-10-10 10:03:06 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2014-10-10 10:03:06 -0400 |
| commit | 533da4ea00703f4ad6d5518e1ce81d20261c40c0 (patch) | |
| tree | 91353158f611e6434e3309423cf8487c62b1826d /src/userdiff.h | |
| parent | f339f441f930de624413968270ea4c164437daec (diff) | |
| parent | 994a3006b61e0a729569770de51d5c13af6a23ed (diff) | |
| download | libgit2-533da4ea00703f4ad6d5518e1ce81d20261c40c0.tar.gz | |
Merge pull request #2473 from arthurschreiber/arthur/new-javascript-test-files
New test files for the javascript diff driver.
Diffstat (limited to 'src/userdiff.h')
| -rw-r--r-- | src/userdiff.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/userdiff.h b/src/userdiff.h index 523f2f8d4..91c1f42dc 100644 --- a/src/userdiff.h +++ b/src/userdiff.h @@ -191,9 +191,9 @@ PATTERNS("php", "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), PATTERNS("javascript", - "^[ \t]*(function[ \t][a-zA-Z_][^\\{]*)\n" - "^[ \t]*(var[ \t]+[a-zA-Z_][a-zA-Z0-9_]*[ \t]*=[ \t]*function[ \t\\(][^\\{]*)\n" - "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*[ \t]*:[ \t]*function[ \t\\(][^\\{]*)", + "([a-zA-Z_$][a-zA-Z0-9_$]*(\\.[a-zA-Z0-9_$]+)*[ \t]*=[ \t]*function([ \t][a-zA-Z_$][a-zA-Z0-9_$]*)?[^\\{]*)\n" + "([a-zA-Z_$][a-zA-Z0-9_$]*[ \t]*:[ \t]*function([ \t][a-zA-Z_$][a-zA-Z0-9_$]*)?[^\\{]*)\n" + "[^a-zA-Z0-9_\\$](function([ \t][a-zA-Z_$][a-zA-Z0-9_$]*)?[^\\{]*)", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+[fFlL]?|0[xX]?[0-9a-fA-F]+[lL]?" |