add test for elif statement

Author: jvllmr

.pre-commit-config.yaml

@@ -4,8 +4,15 @@ ci:
 
 repos:
   - repo: https://github.com/jvllmr/pre-commit-cargo
-    rev: c8489dd
+    rev: c8489ddc7d198af94135f31c3a70cf708e98f069
     hooks:
       - id: cargo-fix
       - id: cargo-fmt
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: "v0.8.4"
+    hooks:
+      - id: ruff
+        args:
+          - --fix
+      - id: ruff-format
 

.vscode/settings.json

@@ -2,5 +2,9 @@
 	"cSpell.words": [
 		"unparse",
 		"Unparser"
-	]
+	],
+	"editor.formatOnSave": true,
+	"[python]": {
+		"editor.defaultFormatter": "charliermarsh.ruff"
+	}
 }

src/unparser.rs

@@ -121,7 +121,7 @@ impl Unparser {
             Stmt::For(data) => self.unparse_stmt_for(data),
             Stmt::AsyncFor(data) => self.unparse_stmt_async_for(data),
             Stmt::While(data) => self.unparse_stmt_while(data),
-            Stmt::If(data) => self.unparse_stmt_if(data),
+            Stmt::If(data) => self.unparse_stmt_if(data, false),
             Stmt::With(data) => self.unparse_stmt_with(data),
             Stmt::AsyncWith(data) => self.unparse_stmt_async_with(data),
             Stmt::Match(data) => self.unparse_stmt_match(data),
@@ -401,8 +401,13 @@ impl Unparser {
         }
     }
 
-    fn unparse_stmt_if(&mut self, node: &StmtIf<TextRange>) {
-        self.fill("if ");
+    fn unparse_stmt_if(&mut self, node: &StmtIf<TextRange>, inner_if: bool) {
+        if inner_if {
+            self.fill("elif ");
+        } else {
+            self.fill("if ");
+        }
+
         self.unparse_expr(&node.test);
         self.write_str(":");
         self.block(|block_self| {
@@ -412,14 +417,7 @@ impl Unparser {
         });
         match node.orelse.as_slice() {
             [Stmt::If(inner_if)] => {
-                self.fill("elif ");
-                self.unparse_expr(&inner_if.test);
-                self.write_str(":");
-                self.block(|block_self| {
-                    for stmt in &inner_if.body {
-                        block_self.unparse_stmt(stmt);
-                    }
-                });
+                self.unparse_stmt_if(inner_if, true);
             }
             [] => {}
             _ => {
@@ -951,8 +949,9 @@ impl Unparser {
     }
 
     fn unparse_expr_attribute(&mut self, node: &ExprAttribute<TextRange>) {
+        self.unparse_expr(&node.value);
         self.write_str(".");
-        self.unparse_expr(&node.value)
+        self.write_str(&node.attr);
     }
     fn unparse_expr_subscript(&mut self, node: &ExprSubscript<TextRange>) {
         self.unparse_expr(&node.value);

test_files/simple_elif_statement.py

@@ -0,0 +1,16 @@
+from datetime import datetime
+
+
+def main():
+    now = datetime.now()
+
+    if now.hour < 12:
+        print("Before noon")
+    elif now.hour > 12:
+        print("After noon")
+    else:
+        print("How did we get here?")
+
+
+if __name__ == "__main__":
+    main()

test_files/simple_f_string.py

@@ -1,4 +1,3 @@
-
 world = "World"
 if __name__ == "__main__":
-    print(f"Hello {world}!")
+    print(f"Hello {world}!")

test_files/simple_if_statement.py

@@ -2,4 +2,4 @@
     pass
 
 if True:
-    print("Hello!")
+    print("Hello!")