Merge pull request #37 from sbrunner/nginject-not-alone

Be able to have more comments in the @ngInject comment

Author: schmod

nginject.js

@@ -124,15 +124,17 @@ function getAnnotation(node){
   }
 
   for(var i=0; i<node.leadingComments.length; i++){
-    let value = node.leadingComments[i].value
-    .replace(/^[\s\*]*/, '')
-    .replace(/[\s\*]*$/, '')
-    .trim();
-
-    if(value === "@ngInject"){
-      return true;
-    } else if (value === "@ngNoInject") {
-      return false;
+    for(const line of node.leadingComments[i].value.split("\n")) {
+      let value = line
+      .replace(/^[\s\*]*/, '')
+      .replace(/[\s\*]*$/, '')
+      .trim();
+
+      if(value === "@ngInject"){
+        return true;
+      } else if (value === "@ngNoInject") {
+        return false;
+      }
     }
   }
 

tests/es6.js

@@ -221,6 +221,84 @@ module.exports = {
         controller: ['a', function(a){}]
       });
     }
+  }, {
+    name: "JSDoc/NGDoc format with annotated class",
+    explicit: true,
+    noES5: false,
+    input: `
+      /**
+       * @some
+       * @other
+       * @annotations
+       *
+       * @description
+       * Example
+       *
+       * @ngInject
+       */
+      var Cls = function(dep1) {
+        this.dep1 = dep1;
+      };
+      angular.module('MyMod').service('MySvc', svc);
+    `,
+    expected: `
+      /**
+       * @some
+       * @other
+       * @annotations
+       *
+       * @description
+       * Example
+       *
+       * @ngInject
+       */
+      var Cls = function(dep1) {
+        this.dep1 = dep1;
+      };
+      Cls.$inject = ['dep1'];
+      angular.module('MyMod').service('MySvc', svc);
+    `,
+  }, {
+    name: "JSDoc/NGDoc format with annotated class",
+    explicit: true,
+    noES5: true,
+    input: `
+      /**
+       * @some
+       * @other
+       * @annotations
+       *
+       * @description
+       * Example
+       *
+       * @ngInject
+       */
+      class svc {
+        constructor (dep1) {
+          this.dep1 = dep1;
+        }
+      }
+      angular.module('MyMod').service('MySvc', svc);
+    `,
+    expected: `
+      /**
+       * @some
+       * @other
+       * @annotations
+       *
+       * @description
+       * Example
+       *
+       * @ngInject
+       */
+      class svc {
+        constructor (dep1) {
+          this.dep1 = dep1;
+        }
+      }
+      svc.$inject = ['dep1'];
+      angular.module('MyMod').service('MySvc', svc);
+    `,
   }
  ]
 };