518439 - Add another test to validation suite

Status: RESOLVED FIXED

(addons.mozilla.org Graveyard :: Developer Pages, defect)

Description

[Wil Clouser [:clouserw]]

From email:

Simply testing for Function including static strings passed as function
body would lead to false positives and has very limited merit.
See the setTimeout discussion
https://bugzilla.mozilla.org/show_bug.cgi?id=509500

It is Function ([arg1[, arg2[, ... argN]],] functionBody)
The new keyword is not required.

I got two suggestions for a regular expression.
Tested both against the following vectors:
var allowed = [
	'Function("abc")',
	"Function('abc')",
	'Function(d, "abc")',
	"Function(d, \n'abc')",
	"Function( d, 'abc' )",
	"Function(d,'abc')",
	'Function(ab, cd, "a"+"bc"+"d")',
];
var bad = [
	"Function(abc)",
	"Function('ab' + abc)",
	'Function(a + "bc" + d)',
	'Function(ab, \ncd)',
	'Function(ab,cd)',
	'Function( ab, cd )',
	'Function(ab, cd, a + "bc" + d)',
	'Function(ab, cd, a + "bc" + "d")',
	'Function(ab, cd, "a"+"bc"+d)',
	'Function(ab, cd, "a"+b+"bc"+d)',
	'Function(ab, cd, a+"a"+"bc"+d)',
	'Function( ab, cd, a + "a" + "bc" + d )',
];

Simple one:
/\bFunction\(.*?[\w\d_]\s*?\)/sm
Or javascripty (i.e. no dotall/s):
/\bFunction\([\S\s]*?[\w\d_]\s*?\)/m

Will work for all except:
Function(ab, cd, a + "bc" + "d")


Better, but more complex:
/\bFunction\((?:.*?[\w\d_]|.*?,.*?(?:['"]\s*?[+]\s*?[\w_]|[\w\d_]\s*?[+]\s*?['"]).*?)\s*?\)/sm
or javascripty
/\bFunction\((?:[\S\s]*?[\w\d_]|[\S\s]*?,[\S\s]*?(?:['"]\s*?[+]\s*?[\w_]|[\w\d_]\s*?[+]\s*?['"])[\S\s]*?)\s*?\)/m

Works for all tests

Cheers
Nils

Comment 1

[RJ Walsh [:rjwalsh]]

Attachment: Fix using Nils' regex

Using the second-to-last regex in comment #0.

Comment 2

[RJ Walsh [:rjwalsh]]

Fixed in r54982.