fix($injector): fix class detection RegExp

Mentioned in angular#14531 (comment).
gkalpak · Apr 28, 2016 · 03b9807 · 03b9807
1 parent afcedff
commit 03b9807
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/auto/injector.js b/src/auto/injector.js
@@ -851,9 +851,10 @@ function createInjector(modulesToLoad, strictDi) {
       }
       var result = func.$$ngIsClass;
       if (!isBoolean(result)) {
+        // Support: Edge 12-13 only
         // Workaround for MS Edge.
-        // Check https://connect.microsoft.com/IE/Feedback/Details/2211653
-        result = func.$$ngIsClass = /^(?:class\s|constructor\()/.test(stringifyFn(func));
+        // See: https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/6156135/
+        result = func.$$ngIsClass = /^(?:class\b|constructor\()/.test(stringifyFn(func));
       }
       return result;
     }

diff --git a/test/auto/injectorSpec.js b/test/auto/injectorSpec.js
@@ -302,6 +302,19 @@ describe('injector', function() {
           expect(instance.aVal()).toEqual('a-value');
         });
 
+        they('should detect ES6 classes regardless of whitespace/comments ($prop)', [
+          'class Test {}',
+          'class Test{}',
+          'class {}',
+          'class{}',
+          'class/* Test */{}'
+        ], function(classDefinition) {
+          var Clazz = eval('(' + classDefinition + ')');
+          var instance = injector.invoke(Clazz);
+
+          expect(instance).toEqual(jasmine.any(Clazz));
+        });
+
         // Support: Chrome 50-51 only
         // TODO (gkalpak): Remove when Chrome v52 is relased.
         // it('should be able to invoke classes', function() {