feat!: replace elif with else if (#6976)

docs/api/03-language/04-flow-controls.md

@@ -48,19 +48,19 @@ for value in 1..=5 {
 }
 ```
 
-### If elif else
+### If / else if / else
 
 ```ts playground example
 let grade = (score: num): str => {
     // Parentheses are optional in conditions.
     // However, curly braces are required in `if/else` statements.
     if 0 < score && score < 55 {
         return "F";
-    } elif 55 <= score && score < 65 {
+    } else if 55 <= score && score < 65 {
         return "C";
-    } elif 65 <= score && score < 75  {
+    } else if 65 <= score && score < 75  {
         return "B";
-    } elif 75 <= score && score <= 100 {
+    } else if 75 <= score && score <= 100 {
         return "A";
     } else {
         return "Invalid grade";

docs/api/05-language-reference.md

@@ -1284,16 +1284,16 @@ includes for and while loops currently.
 
 ### 2.5 if
 
-Flow control can be done with `if/elif/else` statements.  
-The **if** statement is optionally followed by **elif** and **else**.  
+Flow control can be done with `if/else if/else` statements.
+The **if** statement is optionally followed by **else if** and **else**.
 
 > ```TS
 > // Wing program:
 > let x = 1;
 > let y = "sample";
 > if x == 2 {
 >   log("x is 2");
-> } elif y != "sample" {
+> } else if y != "sample" {
 >   log("y is not sample");
 > } else {
 >   log("x is 1 and y is sample");

examples/tests/sdk_tests/bucket/signed_url.test.w

@@ -75,7 +75,7 @@ test "signedUrl duration option is respected" {
 
     if target == "tf-aws" {
       result = output.contains("<Code>AccessDenied</Code><Message>Request has expired</Message>");
-    } elif target == "tf-gcp" {
+    } else if target == "tf-gcp" {
       result = output.contains("<Code>ExpiredToken</Code><Message>Invalid argument.</Message>");
     }
 
@@ -95,4 +95,4 @@ test "signedUrl duration option is respected" {
   let output = util.shell("curl \"{getSignedUrl}\"");
 
   expect.equal(isExpiredTokenError(output), true);
-}
+}

examples/tests/sdk_tests/function/aws-function.test.w

@@ -44,7 +44,7 @@ new std.Test(inflight () => {
       assert(info.get("functionArn").contains(":function:"));
       assert(info.get("functionArn").contains("aws-wing-function"));
       assert(info.get("functionName").contains("aws-wing-function"));
-    } elif target == "awscdk" {
+    } else if target == "awscdk" {
       assert(info.get("functionArn").contains("arn:aws:lambda:"));
       assert(info.get("functionArn").contains(":function:"));
       assert(info.get("functionArn").contains("awswingfunction"));

examples/tests/valid/dynamo.test.w

@@ -78,9 +78,9 @@ class DynamoTable {
   inflight _attributeTypeToString(type: AttributeType): str {
     if type == AttributeType.String {
       return "S";
-    } elif type == AttributeType.Number {
+    } else if type == AttributeType.Number {
       return "N";
-    } elif type == AttributeType.Binary {
+    } else if type == AttributeType.Binary {
       return "B";
     }
   }

examples/tests/valid/dynamo_awscdk.test.w

@@ -88,9 +88,9 @@ class DynamoTable {
   inflight _attributeTypeToString(type: AttributeType): str {
     if type == AttributeType.String {
       return "S";
-    } elif type == AttributeType.Number {
+    } else if type == AttributeType.Number {
       return "N";
-    } elif type == AttributeType.Binary {
+    } else if type == AttributeType.Binary {
       return "B";
     }
   }

examples/tests/valid/optionals.test.w

@@ -60,9 +60,9 @@ let json_obj = Json { ghost: "spooky" };
 let var something_else = false;
 if let y = json_obj.tryAsBool() {
   assert(y == true || y == false);
-} elif let y = json_obj.tryAsNum() {
+} else if let y = json_obj.tryAsNum() {
   assert(y + 0 == y);
-} elif let y = json_obj.tryAsStr() {
+} else if let y = json_obj.tryAsStr() {
   assert(y.length >= 0);
 } else {
   something_else = true;
@@ -199,7 +199,7 @@ let str2: str? = nil;
 
 if let s1 = str1 {
   assert(false); // Should not happen
-} elif let s2 = str2 {
+} else if let s2 = str2 {
   assert(true);
 }
 

examples/tests/valid/statements_if.test.w

@@ -6,11 +6,11 @@ if true {
   if true && x + 2 == 4 {
     if true && x + 3 == 4 {
       assert(false);
-    } elif true && x + 3 == 6 {
+    } else if true && x + 3 == 6 {
       assert(false);
-    } elif false || x + 3 == 5 {
+    } else if false || x + 3 == 5 {
       assert(true);
-    } elif !f {
+    } else if !f {
       assert(!!!f);
     } else {
       assert(false);
@@ -26,9 +26,9 @@ test "test" {
     if true && x + 2 == 4 {
       if true && x + 3 == 4 {
         assert(false);
-      } elif true && x + 3 == 6 {
+      } else if true && x + 3 == 6 {
         assert(false);
-      } elif false || x + 3 == 5 {
+      } else if false || x + 3 == 5 {
         assert(true);
       } else {
         assert(false);
@@ -45,9 +45,9 @@ if true {
   let c: str? = "c";
   if let d = a {
     assert(false);
-  } elif b != nil {
+  } else if b != nil {
     assert(true);
-  } elif let e = c {
+  } else if let e = c {
     assert(false);
   } else {
     assert(false);
@@ -60,9 +60,9 @@ if true {
   let c: str? = "c";
   if let d = a {
     assert(false);
-  } elif let e = c {
+  } else if let e = c {
     assert(true);
-  } elif b != nil {
+  } else if b != nil {
     assert(false);
   } else {
     assert(false);

libs/tree-sitter-wing/grammar.js

@@ -309,16 +309,17 @@ module.exports = grammar({
         field("block", $.block),
         repeat(
           choice(
-            field("elif_let_block", $.elif_let_block),
-            field("elif_block", $.elif_block)
+            field("else_if_let_block", $.else_if_let_block),
+            field("else_if_block", $.else_if_block)
           )
         ),
         optional(seq("else", field("else_block", $.block)))
       ),
 
-    elif_let_block: ($) =>
+    else_if_let_block: ($) =>
       seq(
-        "elif",
+        "else",
+        "if",
         "let",
         optional(field("reassignable", $.reassignable)),
         field("name", $.identifier),
@@ -332,12 +333,12 @@ module.exports = grammar({
         "if",
         field("condition", $.expression),
         field("block", $.block),
-        repeat(field("elif_block", $.elif_block)),
+        repeat(field("else_if_block", $.else_if_block)),
         optional(seq("else", field("else_block", $.block)))
       ),
 
-    elif_block: ($) =>
-      seq("elif", field("condition", $.expression), field("block", $.block)),
+    else_if_block: ($) =>
+      seq("else", "if", field("condition", $.expression), field("block", $.block)),
 
     try_catch_statement: ($) =>
       seq(

libs/tree-sitter-wing/queries/folds.scm

@@ -7,7 +7,7 @@
   (while_statement)
   (if_statement)
   (if_let_statement)
-  (elif_block)
+  (else_if_block)
   (struct_definition)
   (enum_definition)
   (try_catch_statement)