Fix "effectively final" computation in a switch

javatools/src/main/java/org/xvm/compiler/ast/SwitchStatement.java

@@ -665,9 +665,14 @@ protected CaseBlockContext(SwitchContext ctxOuter)
         @Override
         public Context exit()
             {
-            // don't contribute; the break statement has already registered the "Statement.Break"
-            // info that will be processed at the end of Statement.validate() logic
-            return getOuterContext();
+            Context ctxOuter = getOuterContext();
+
+            // promote the assignments, but not narrowed types; the break statement has already
+            // registered the "Statement.Break" info that will be processed at the end of
+            // Statement.validate() logic
+            promoteAssignments(ctxOuter);
+
+            return ctxOuter;
             }
         }
 

manualTests/src/main/x/TestSimple.x

@@ -2,15 +2,22 @@ module TestSimple.examples.org {
     @Inject Console console;
 
     void run() {
-        String[] strings = ["abc", "def"];
-
-        Test<String> t = new Test(strings);
-        String[] filtered = t.filter(s -> s.indexOf("e")).toArray(Constant); // that used to fail at RT
-        console.print(filtered);
     }
 
-    service Test<Element>(Collection<Element> underlying)
-        implements Collection<Element>
-        delegates Collection(underlying) {
+    Int test(Int x) {
+        switch (x) {
+        case 0:
+            return 0;
+
+        case 1:
+            Int bug = x + 1;
+            function Int (Int) supply = i -> {
+                return bug + i; // "bug" used to be not "effectively final"
+            };
+            return 1;
+
+        default:
+            return 0;
+        }
     }
 }