adjust for #92

Author: Buckwich

lib/base/VariableResolver.js

@@ -301,7 +301,7 @@ export class BaseVariableResolver {
 
     const seenNames = new Set();
 
-    return reversedVariables.filter(variable => {
+    const deduplicatedVariables = reversedVariables.filter(variable => {
 
       const provider = variable.provider || [];
 
@@ -319,6 +319,23 @@ export class BaseVariableResolver {
 
       return false;
     });
+
+    return deduplicatedVariables.map(variable => {
+      if (!variable.usedBy || !Array.isArray(variable.usedBy)) {
+        return variable;
+      }
+
+      const usedBy = filterUsedByForElement(variable, bo);
+
+      if (usedBy.length === variable.usedBy.length) {
+        return variable;
+      }
+
+      return {
+        ...variable,
+        usedBy: usedBy.length ? usedBy : undefined
+      };
+    });
   }
 
   _getScope(element, containerElement, variableName, checkYourself) {
@@ -472,4 +489,42 @@ function isUsedOutsideOwnScope(variable) {
   return variable.usedBy.some(usedBy => {
     return usedBy && usedBy.id && !isElementInScope(usedBy, variable.scope);
   });
+}
+
+function filterUsedByForElement(variable, element) {
+  const names = variable.usedBy.filter(usage => typeof usage === 'string');
+  const elements = variable.usedBy.filter(usage => usage && usage.id);
+
+  if (!variable.scope) {
+    return [ ...names, ...elements.filter(usage => isElementInScope(usage, element)) ];
+  }
+
+  // Querying the variable's own scope: show local consumers.
+  if (element.id === variable.scope.id) {
+    return [
+      ...names,
+      ...elements.filter(usage => isElementInScope(usage, variable.scope))
+    ];
+  }
+
+  // Querying an ancestor scope: show consumers outside the variable's own scope.
+  if (isElementInScope(variable.scope, element)) {
+    return [
+      ...names,
+      ...elements.filter(usage =>
+        isElementInScope(usage, element)
+        && !isElementInScope(usage, variable.scope)
+      )
+    ];
+  }
+
+  // Querying a child scope: show consumers in that child scope only.
+  if (isElementInScope(element, variable.scope)) {
+    return [
+      ...names,
+      ...elements.filter(usage => isElementInScope(usage, element))
+    ];
+  }
+
+  return names;
 }