Fix running hooks

We should be able resolve functions with $injector - this is required for hooks execution and generating help content.
Get back the old unit tests that were testing this functionality.

Author: rosen-vladimirov

helpers.ts

@@ -360,11 +360,12 @@ export function connectEventuallyUntilTimeout(factory: () => net.Socket, timeout
 //	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //THE SOFTWARE.
 
-let FN_NAME = /class\s+([A-Z].+?)(?:\s+.*?)?\{/;
-let FN_ARGS = /constructor\s*([^\(]*)\(\s*([^\)]*)\)/m;
-let FN_ARG_SPLIT = /,/;
-let FN_ARG = /^\s*(_?)(\S+?)\1\s*$/;
-let STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
+const CLASS_NAME = /class\s+([A-Z].+?)(?:\s+.*?)?\{/;
+const CONSTRUCTOR_ARGS = /constructor\s*([^\(]*)\(\s*([^\)]*)\)/m;
+const FN_NAME_AND_ARGS = /^(?:function)?\s*([^\(]*)\(\s*([^\)]*)\)\s*\{/m;
+const FN_ARG_SPLIT = /,/;
+const FN_ARG = /^\s*(_?)(\S+?)\1\s*$/;
+const STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
 
 export function annotate(fn: any) {
 	let $inject: any,
@@ -375,19 +376,27 @@ export function annotate(fn: any) {
 		if (!($inject = fn.$inject) || $inject.name !== fn.name) {
 			$inject = { args: [], name: "" };
 			fnText = fn.toString().replace(STRIP_COMMENTS, '');
-			argDecl = fnText.match(FN_ARGS);
 
-			let nameMatch = fnText.match(FN_NAME);
+			let nameMatch = fnText.match(CLASS_NAME);
+
+			if (nameMatch) {
+				argDecl = fnText.match(CONSTRUCTOR_ARGS);
+			} else {
+				nameMatch = argDecl = fnText.match(FN_NAME_AND_ARGS);
+			}
+
 			$inject.name = nameMatch && nameMatch[1];
 
-			if (argDecl && fn.length) {
+			if (argDecl && fnText.length) {
 				argDecl[2].split(FN_ARG_SPLIT).forEach((arg) => {
 					arg.replace(FN_ARG, (all, underscore, name) => $inject.args.push(name));
 				});
 			}
+
 			fn.$inject = $inject;
 		}
 	}
+
 	return $inject;
 }