diff --git a/main.js b/main.js index 3fba230..c5e2b59 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|'+ REGEX_PATTERNS.jsVariable + '.)?\\s*'+ REGEX_PATTERNS.jsVariable + '\\s*=\\s*function\\s*\\(\\s*(' + + functionExpresionRegex = new RegExp('^[a-z0-9]*\\s*\\n*(var|(' + REGEX_PATTERNS.jsVariable + '.)*(' + REGEX_PATTERNS.jsVariable + ')?)?\\s*'+ REGEX_PATTERNS.jsVariable + '\\s*(=|:)\\s*function\\s*\\(\\s*(' + REGEX_PATTERNS.jsVariable + '\\s*(,\\s*)?)*\\s*\\)\\s*','g'); pos.ch = 0; diff --git a/test_dummy.js b/test_dummy.js index bfc51e4..0f22c8c 100644 --- a/test_dummy.js +++ b/test_dummy.js @@ -8,7 +8,7 @@ define(function (require, exports, module) { 'use strict'; - var greetings = "Hello world"), + var greetings = "Hello world"; function declaration(input) { @@ -30,11 +30,35 @@ define(function (require, exports, module) { } + var _privateStuff = function(p1, p2) { - var content = "I start with an underscore"; - }; + var myObject = {}; + + myObject.myFunction = function (param1, param2, param3) { + + }; + + + myObject.prototype.myFunction = function (param1, param2) { + + }; + + + var a = { + doA: function(param1, param2){ + var content = "stuff"; + + return content; + }, + doB: function(param1, param2){ + var content = "stuff"; + + return content; + } + }; + }); \ No newline at end of file