feat($compile): show module name during multidir error

Show module name if possible when multidir error happens.

Closes angular#11775

Author: lugovsky

src/auto/injector.js

@@ -620,6 +620,7 @@ function createInjector(modulesToLoad, strictDi) {
       providerSuffix = 'Provider',
       path = [],
       loadedModules = new HashMap([], true),
+      namedModulesLoaded = [],
       providerCache = {
         $provide: {
             provider: supportObject(provider),
@@ -735,6 +736,7 @@ function createInjector(modulesToLoad, strictDi) {
 
       try {
         if (isString(module)) {
+          namedModulesLoaded.push(module);
           moduleFn = angularModule(module);
           runBlocks = runBlocks.concat(loadModules(moduleFn.requires)).concat(moduleFn._runBlocks);
           runInvokeQueue(moduleFn._invokeQueue);
@@ -843,7 +845,8 @@ function createInjector(modulesToLoad, strictDi) {
       annotate: createInjector.$$annotate,
       has: function(name) {
         return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name);
-      }
+      },
+      _namedModulesLoaded: namedModulesLoaded
     };
   }
 }

src/ng/compile.js

@@ -852,6 +852,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
                 if (isObject(bindings.isolateScope)) {
                   directive.$$isolateBindings = bindings.isolateScope;
                 }
+                directive._factory = directiveFactory;
                 directives.push(directive);
               } catch (e) {
                 $exceptionHandler(e);
@@ -2300,11 +2301,35 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       return a.index - b.index;
     }
 
+    function getModuleNameByDirectiveName(directive) {
+      var moduleName = '';
+
+      forEach($injector._namedModulesLoaded, function(loadedModuleName) {
+        var loadedModule = angularModule(loadedModuleName);
+        forEach(loadedModule._invokeQueue, function(invokeItem) {
+          var invocationParams = invokeItem[2];
+          if (invokeItem[1] == 'directive' &&
+            invocationParams['0'] === directive.name &&
+            invocationParams['1'] === directive._factory) {
+            moduleName = loadedModule.name;
+          }
+        });
+      });
+      return moduleName;
+    }
 
     function assertNoDuplicate(what, previousDirective, directive, element) {
+
+      function wrapModuleNameIfDefined(moduleName) {
+        return moduleName ?
+          (' (module: ' + moduleName + ')') :
+          '';
+      }
+
       if (previousDirective) {
-        throw $compileMinErr('multidir', 'Multiple directives [{0}, {1}] asking for {2} on: {3}',
-            previousDirective.name, directive.name, what, startingTag(element));
+        throw $compileMinErr('multidir', 'Multiple directives [{0}{1}, {2}{3}] asking for {4} on: {5}',
+            previousDirective.name, wrapModuleNameIfDefined(getModuleNameByDirectiveName(previousDirective)),
+            directive.name, wrapModuleNameIfDefined(getModuleNameByDirectiveName(directive)), what, startingTag(element));
       }
     }
 

test/ng/compileSpec.js

@@ -2127,9 +2127,11 @@ describe('$compile', function() {
       describe('scope', function() {
         var iscope;
 
-        beforeEach(module(function() {
-          forEach(['', 'a', 'b'], function(name) {
-            directive('scope' + uppercase(name), function(log) {
+        var fakeScopeMdl = angular.module('fakeScopeMdl', []);
+
+        forEach(['', 'a', 'b'], function(name) {
+          fakeScopeMdl
+            .directive('scope' + uppercase(name), function(log) {
               return {
                 scope: true,
                 restrict: 'CA',
@@ -2140,8 +2142,8 @@ describe('$compile', function() {
                   }};
                 }
               };
-            });
-            directive('iscope' + uppercase(name), function(log) {
+            })
+            .directive('iscope' + uppercase(name), function(log) {
               return {
                 scope: {},
                 restrict: 'CA',
@@ -2153,8 +2155,8 @@ describe('$compile', function() {
                   };
                 }
               };
-            });
-            directive('tscope' + uppercase(name), function(log) {
+            })
+            .directive('tscope' + uppercase(name), function(log) {
               return {
                 scope: true,
                 restrict: 'CA',
@@ -2166,8 +2168,8 @@ describe('$compile', function() {
                   };
                 }
               };
-            });
-            directive('stscope' + uppercase(name), function(log) {
+            })
+            .directive('stscope' + uppercase(name), function(log) {
               return {
                 scope: true,
                 restrict: 'CA',
@@ -2179,8 +2181,8 @@ describe('$compile', function() {
                   };
                 }
               };
-            });
-            directive('trscope' + uppercase(name), function(log) {
+            })
+            .directive('trscope' + uppercase(name), function(log) {
               return {
                 scope: true,
                 replace: true,
@@ -2193,8 +2195,8 @@ describe('$compile', function() {
                   };
                 }
               };
-            });
-            directive('tiscope' + uppercase(name), function(log) {
+            })
+            .directive('tiscope' + uppercase(name), function(log) {
               return {
                 scope: {},
                 restrict: 'CA',
@@ -2207,8 +2209,8 @@ describe('$compile', function() {
                   };
                 }
               };
-            });
-            directive('stiscope' + uppercase(name), function(log) {
+            })
+            .directive('stiscope' + uppercase(name), function(log) {
               return {
                 scope: {},
                 restrict: 'CA',
@@ -2222,17 +2224,19 @@ describe('$compile', function() {
                 }
               };
             });
-          });
-          directive('log', function(log) {
+        });
+
+        fakeScopeMdl
+          .directive('log', function(log) {
             return {
               restrict: 'CA',
               link: {pre: function(scope) {
                 log('log-' + scope.$id + '-' + (scope.$parent && scope.$parent.$id || 'no-parent'));
               }}
             };
           });
-        }));
 
+        beforeEach(module('fakeScopeMdl'));
 
         it('should allow creation of new scopes', inject(function($rootScope, $compile, log) {
           element = $compile('<div><span scope><a log></a></span></div>')($rootScope);
@@ -2335,7 +2339,7 @@ describe('$compile', function() {
           function($rootScope, $compile) {
             expect(function() {
               $compile('<div class="iscope-a; scope-b"></div>');
-            }).toThrowMinErr('$compile', 'multidir', 'Multiple directives [iscopeA, scopeB] asking for new/isolated scope on: ' +
+            }).toThrowMinErr('$compile', 'multidir', 'Multiple directives [iscopeA (module: fakeScopeMdl), scopeB (module: fakeScopeMdl)] asking for new/isolated scope on: ' +
                 '<div class="iscope-a; scope-b">');
           })
         );
@@ -2354,7 +2358,7 @@ describe('$compile', function() {
           inject(function($compile) {
             expect(function() {
               $compile('<div class="iscope-a; high-priority-scope"></div>');
-            }).toThrowMinErr('$compile', 'multidir', 'Multiple directives [highPriorityScope, iscopeA] asking for new/isolated scope on: ' +
+            }).toThrowMinErr('$compile', 'multidir', 'Multiple directives [highPriorityScope, iscopeA (module: fakeScopeMdl)] asking for new/isolated scope on: ' +
                     '<div class="iscope-a; high-priority-scope">');
           });
         });