Merge branch 'spec1119'

Update for ceylon/ceylon-spec#1119: Inline variable in switch.
eclipse-archived · Nov 19, 2014 · 6fb7bfc · 6fb7bfc
2 parents cc42a41 + 87a3619
commit 6fb7bfc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/source/ceylon/formatter/FormattingVisitor.ceylon b/source/ceylon/formatter/FormattingVisitor.ceylon
@@ -1736,7 +1736,7 @@ shared class FormattingVisitor(
  indentAfter = 1;
  lineBreaksAfter = noLineBreak;
  };
- that.expression.visit(this);
+ that.switched.visit(this);
  fWriter.writeToken {
  ")"; // not in the AST as well
  context;

diff --git a/test-samples/switch.ceylon b/test-samples/switch.ceylon
@@ -30,3 +30,9 @@ void testSwitchWithMultipleCases() {
  // do other stuff
  }
 }
+
+void testSwitchWithNewVariable() {
+ switch (arg = process.arguments.first)
+ case (is String) { print("Hello, ``arg``!"); }
+ case (null) { print("USAGE: ceylon run `` `module`.name ``/`` `module`.version `` [NAME]"); }
+}
diff --git a/test-samples/switch.ceylon.formatted b/test-samples/switch.ceylon.formatted
@@ -30,3 +30,9 @@ void testSwitchWithMultipleCases() {
  // do other stuff
  }
 }
+
+void testSwitchWithNewVariable() {
+ switch (arg = process.arguments.first)
+ case (is String) { print("Hello, ``arg``!"); }
+ case (null) { print("USAGE: ceylon run `` `module`.name ``/`` `module`.version `` [NAME]"); }
+}