#140 Incorrect generated code for the PerBlock lifetime: a local or parameter named ... cannot be declared in this scope because that name is used in an enclosing local scope to define a local or parameter

Author: NikolayPianikov

src/Pure.DI.Core/Core/Code/VarsMap.cs

@@ -176,12 +176,41 @@ public IDisposable Lazy(Var var, Lines lines)
     public IDisposable Block(Var var, Lines lines)
     {
         var scope = EnterScope(var.AbstractNode.BindingId);
+
+        // Per-block variables should be isolated between blocks.
+        List<KeyValuePair<int, Var>>? removed = null;
+        foreach (var bindingId in _perBlockBindingIds)
+        {
+            if (!_map.TryGetValue(bindingId, out var perBlockVar))
+            {
+                continue;
+            }
+
+#if DEBUG
+            lines.AppendLine($"// {perBlockVar.Declaration.Name}: remove ({nameof(Block)})");
+#endif
+            (removed ??= new List<KeyValuePair<int, Var>>(_perBlockBindingIds.Count)).Add(new KeyValuePair<int, Var>(bindingId, perBlockVar));
+            _map.Remove(bindingId);
+        }
+
         return Disposables.Create(() => {
             _suppressedTrackingCount++;
             try
             {
                 RemoveNewNonPersistentVars(var, scope, lines, nameof(Block));
                 RestoreState(scope, lines, nameof(Block), false);
+                if (removed is null)
+                {
+                    return;
+                }
+
+                foreach (var item in removed)
+                {
+#if DEBUG
+                    lines.AppendLine($"// {item.Value.Declaration.Name}: rollback ({nameof(Block)})");
+#endif
+                    _map[item.Key] = item.Value;
+                }
             }
             finally
             {