fix(compile): assign controller return value to correct ctrls

Fixes angular#12029

Author: Narretz

src/ng/compile.js

@@ -1983,9 +1983,10 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
           var scopeDirective = newIsolateScopeDirective || newScopeDirective;
           var bindings;
           var controllerForBindings;
+          var scopeController;
           if (scopeDirective && elementControllers[scopeDirective.name]) {
             bindings = scopeDirective.$$bindings.bindToController;
-            controller = elementControllers[scopeDirective.name];
+            controller = scopeController = elementControllers[scopeDirective.name];
 
             if (controller && controller.identifier && bindings) {
               controllerForBindings = controller;
@@ -1997,9 +1998,11 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
           for (i in elementControllers) {
             controller = elementControllers[i];
             var controllerResult = controller();
+
             if (controllerResult !== controller.instance) {
               controller.instance = controllerResult;
-              $element.data('$' + directive.name + 'Controller', controllerResult);
+              var name = controller === scopeController ? scopeDirective.name : directive.name;
+              $element.data('$' + name + 'Controller', controllerResult);
               if (controller === controllerForBindings) {
                 // Remove and re-install bindToController bindings
                 thisLinkFn.$$destroyBindings();

test/ng/compileSpec.js

@@ -4573,6 +4573,35 @@ describe('$compile', function() {
     });
 
 
+    it('should not confuse ngController and directive controller', function() {
+      var ngController, directiveController;
+      module(function($controllerProvider) {
+        $controllerProvider.register('myCtrl', function() {
+          return ngController = {
+            foo: 'bar'
+          };
+        });
+
+        directive('myDirective', function(log) {
+          return {
+            controller: function($scope) {
+              return directiveController = {
+                baz: 'val'
+              };
+            }
+          };
+        });
+
+      });
+
+      inject(function(log, $compile, $rootScope) {
+        element = $compile('<my-directive ng-controller="myCtrl"></my-directive>')($rootScope);
+        expect(element.data('$ngControllerController')).toBe(ngController);
+        expect(element.data('$myDirectiveController')).toBe(directiveController);
+      });
+    });
+
+
     it('should get required parent controller', function() {
       module(function() {
         directive('nested', function(log) {