fix(events): fix property expression extraction code to not break $parse

Author: erwinmombay

src/modules/events.js

@@ -6,18 +6,43 @@
 var ngEventAttributes = require('../lib/event-directives'),
     MODULE_NAME = 'Events';
 
+/*
+ * Remove string expressions except property accessors.
+ * ex. abc["def"] = "gef"; // `removeStringExp` will remove "gef" but not "def".
+ */
+function removeStringExp(str) {
+  return str.replace(/"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'/g,
+    function(match, pos, full) {
+      // this is our lookaround code so that our regex doesn't become so
+      // complicated.
+      if (pos !== 0 && (match.length + pos) !== full.length &&
+          full[pos - 1] === '[' && full[pos + match.length] === ']') {
+           return match;
+      }
+      return '';
+    });
+}
 
 var getFunctionNames = function(str) {
   if (typeof str !== 'string') {
     return [];
   }
-  var results = str.replace(/\s+/g, '').split(/[\+\-\/\|\<\>\^=&!%~;]/g).map(function(x) {
-    if (isNaN(+x)) {
-      if (x.match(/\w+\(.*\)$/)){
-        return x.substr(0, x.indexOf('('));
+  // There are still a bunch of corner cases here where we aren't going to be able to handle
+  // but we shouldn't break the user's app and we should handle most common cases.
+  // example of corner cases: we can't check for properties inside of function
+  // arguments like `move(a.b.c)` with the current implementation
+  // or property accessors with parentheses in them
+  // like `prop["hello (world)"] = "test";`.
+  // To fully fix these issues we would need a full blown expression parser.
+  var results = removeStringExp(str.replace(/\s+/g, ''))
+    .replace(/\(.*?\)/g, '')
+    .split(/[\+\-\/\|\<\>\^=&!%~;]/g).map(function(x) {
+      if (isNaN(+x)) {
+        if (x.match(/\w+\(.*\)$/)){
+          return x.substr(0, x.indexOf('('));
+        }
+        return x;
       }
-      return x;
-    }
   }).filter(function(x){
     return x;
   });

test/events.spec.js

@@ -56,6 +56,33 @@ describe('hintEvents', function() {
     expect(angular.hint.emit).toHaveBeenCalledWith('Events:undef', 'a.b is undefined');
   });
 
+  it('should be able to check strings expressions with operator characters in angular expressions', function() {
+    var elt = angular.element('<button ng-click="a.b.c = \'-hello>\';[\'array\']">Fake Increment</button>');
+    $rootScope.a = { b: { c: '' } }
+    $compile(elt)($rootScope);
+
+    $rootScope.$digest();
+    expect(angular.hint.emit).not.toHaveBeenCalledWith('Events:undef', 'a.b.c is undefined');
+  });
+
+  it('should be able to check multiple angular expressions including string expressions with operator characters', function() {
+    var elt = angular.element('<button ng-click="j.f.k;x.y.z = \'-hello\'"></button>');
+    $compile(elt)($rootScope);
+
+    $rootScope.$digest();
+    expect(angular.hint.emit).toHaveBeenCalledWith('Events:undef', 'x.y.z is undefined');
+    expect(angular.hint.emit).toHaveBeenCalledWith('Events:undef', 'j.f.k is undefined');
+  });
+
+  it('should be able to check expressions with operator characters in function invocation', function() {
+    var elt = angular.element('<button ng-click="showPanel(-1);move(a > b)"></button>');
+    $compile(elt)($rootScope);
+
+    $rootScope.$digest();
+    expect(angular.hint.emit).toHaveBeenCalledWith('Events:undef', 'showPanel is undefined');
+    expect(angular.hint.emit).toHaveBeenCalledWith('Events:undef', 'move is undefined');
+  });
+
   // TODO: implement this
   it('should log a message if the path to handle an ng-event is not found', function() {
     var elt = angular.element('<button ng-click="a.b.c()">Fake Increment</button>');