From 994a3006b61e0a729569770de51d5c13af6a23ed Mon Sep 17 00:00:00 2001 From: Arthur Schreiber Date: Thu, 9 Oct 2014 22:21:34 +0200 Subject: [PATCH] Update the javascript diff driver's function pattern. --- src/userdiff.h | 6 +++--- .../userdiff/expected/driver/diff.javascript | Bin 862 -> 932 bytes 2 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]?" diff --git a/tests/resources/userdiff/expected/driver/diff.javascript b/tests/resources/userdiff/expected/driver/diff.javascript index 44ea9cf777118686c50098f6859f053c69141ca6..4cefe5cff67766681c702c6f0cd0ee1d4f6084e8 100644 GIT binary patch delta 131 zcmcb|wuF7c0%e7?(!Au7%=|o!qSV6D%%W5sh180I{GyU#9fjQdl+v73&5a8T8I=Qa z5-U@S^a_gdOY%!93sUuR^UG303lwY-226g+*rS1=E~O~399dOzeqKpxMakq=rkeoY C1Tu2~ delta 26 hcmZ3&evfU!f{lj_87Jp4icgke>IBlVldmvc004`s3J(AP