From a5bd28fcde2021abf826b292e2ba65581daee27f Mon Sep 17 00:00:00 2001 From: benedikt willi Date: Wed, 26 Mar 2014 17:13:22 +0100 Subject: [PATCH] Updated functionExpressionRegex to match values of type someObject.someFunction = function(p1, p2) --- main.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/main.js b/main.js index bddb2b1..3fba230 100644 --- a/main.js +++ b/main.js @@ -81,7 +81,7 @@ define(function (require, exports, module) { functionDeclarationRegex = new RegExp('^[a-z0-9]*\\s*\\n*\\bfunction\\b\\s*' + REGEX_PATTERNS.jsVariable + '\\s*\\(\\s*(' + REGEX_PATTERNS.jsVariable + '\\s*,?)*\\s*\\)','g'), - functionExpresionRegex = new RegExp('^[a-z0-9]*\\s*\\n*(var)?\\s*'+ REGEX_PATTERNS.jsVariable + '\\s*=\\s*function\\s*\\(\\s*(' + + functionExpresionRegex = new RegExp('^[a-z0-9]*\\s*\\n*(var|'+ REGEX_PATTERNS.jsVariable + '.)?\\s*'+ REGEX_PATTERNS.jsVariable + '\\s*=\\s*function\\s*\\(\\s*(' + REGEX_PATTERNS.jsVariable + '\\s*(,\\s*)?)*\\s*\\)\\s*','g'); pos.ch = 0; @@ -100,17 +100,16 @@ define(function (require, exports, module) { var results = txtFrom.match(new RegExp(REGEX_PATTERNS.jsVariable,'g')); switch(true) { case functionExpresionRegex.test(txtFrom): - return { //check for 'var' - name:results[results.indexOf('var') === -1 ? 0:1], - params:results.slice(results.indexOf('var') === -1 ? 2:3), + name:results[results.indexOf('function')-1], + params:results.slice(results.indexOf('function')+1), prefix: getPrefix(txtFrom, results[0]), returnsValue:returnsValue }; case functionDeclarationRegex.test(txtFrom): - console.log(results[1]); - return { + //console.log(results[1]); + return { name:results[1], params:results.slice(2), prefix: getPrefix(txtFrom, results[0]), @@ -183,4 +182,4 @@ define(function (require, exports, module) { menu.addMenuDivider(); menu.addMenuItem(COMMAND_ID);//"menu-edit-annotate", -}); +}); \ No newline at end of file