fix/merge changes with master

Author: armano2

Diff for: lib/rules/no-template-shadow.js

@@ -38,7 +38,7 @@ module.exports = {
     // Public
     // ----------------------------------------------------------------------
 
-    utils.registerTemplateBodyVisitor(context, {
+    return utils.defineTemplateBodyVisitor(context, {
       VElement (node) {
         scope = {
           parent: scope,
@@ -66,13 +66,11 @@ module.exports = {
       'VElement:exit' (node) {
         scope = scope.parent
       }
-    })
-
-    return utils.executeOnVue(context, (obj) => {
+    }, utils.executeOnVue(context, (obj) => {
       const properties = Array.from(utils.iterateProperties(obj, new Set(GROUP_NAMES)))
       for (const node of properties) {
         jsVars.add(node.name)
       }
-    })
+    }))
   }
 }

Diff for: lib/utils/index.js

@@ -26,7 +26,7 @@ module.exports = {
    *
    * @param {RuleContext} context The rule context to use parser services.
    * @param {Object} templateBodyVisitor The visitor to traverse the template body.
-   * @param {Object} scriptVisitor The visitor to traverse the script.
+   * @param {Object} [scriptVisitor] The visitor to traverse the script.
    * @returns {Object} The merged visitor.
    */
   defineTemplateBodyVisitor (context, templateBodyVisitor, scriptVisitor) {

Diff for: tests/lib/rules/no-template-shadow.js

@@ -31,6 +31,7 @@ ruleTester.run('no-template-shadow', rule, {
     '<template><div v-for="i in 5"></div></template>',
     '<template><div v-for="i in 5"><div v-for="b in 5"></div></div></template>',
     '<template><div v-for="i in 5"></div><div v-for="i in 5"></div></template>',
+    '<template> <ul v-for="i in 5"> <li> <span v-for="j in 10">{{i}},{{j}}</span> </li> </ul> </template>',
     {
       filename: 'test.vue',
       code: `<template>