refactor: refactor unnecessary else / elif when if block has a …

…`return` statement (#20)

Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>

examples/json.py

@@ -116,8 +116,7 @@ def tokenize(json_string):
         if new_index is None:
             print("Parsing error at index", index)
             return None
-        else:
-            index = new_index
+        index = new_index
 
     return tokens
 

src/interpreted/interpreter.py

@@ -545,7 +545,7 @@ def visit_Compare(self, node: Compare) -> Value:
         if node.op == "in":
             if isinstance(right, str):
                 return Value(left in right)
-            elif isinstance(right, (list, tuple, deque, dict)):
+            if isinstance(right, (list, tuple, deque, dict)):
                 return Value(
                     any(
                         isinstance(element, Value) and element.value == left
@@ -555,7 +555,7 @@ def visit_Compare(self, node: Compare) -> Value:
         if node.op == "not in":
             if isinstance(right, str):
                 return Value(left not in right)
-            elif isinstance(right, (list, tuple, deque)):
+            if isinstance(right, (list, tuple, deque)):
                 return Value(
                     not any(
                         isinstance(element, Value) and element.value == left
@@ -614,9 +614,9 @@ def visit_UnaryOp(self, node: UnaryOp) -> Value:
 
         if node.op == "not":
             return Value(not value.value)
-        elif node.op == "+":
+        if node.op == "+":
             return value
-        elif node.op == "-":
+        if node.op == "-":
             return Value(-value.value)
 
         raise AssertionError(f"node.op must be '+', '-', or 'not', found {node!r}")
@@ -648,8 +648,7 @@ def visit_Subscript(self, node: Subscript) -> Object:
                         f"Slice indices should be integers or 'None', got {start.repr()}, {end.repr()}"
                     )
                 return Value(obj.value[start.value : end.value])
-            else:
-                raise NotImplementedError(node)
+            raise NotImplementedError(node)
 
         key = self.visit(node.key)
         if isinstance(obj, (List, Tuple, Deque)):
@@ -677,7 +676,7 @@ def visit_Attribute(self, node: Attribute) -> Object:
         if attribute_name in obj.attributes:
             return obj.attributes[attribute_name]
 
-        elif attribute_name in obj.methods:
+        if attribute_name in obj.methods:
             return obj.methods[attribute_name]
 
         raise InterpreterError(

src/interpreted/parser.py

@@ -185,8 +185,7 @@ def parse_statement(self) -> Statement:
 
         if self.match_name("def", "if", "for", "while"):
             return self.parse_multiline_statement()
-        else:
-            return self.parse_single_line_statement()
+        return self.parse_single_line_statement()
 
     def parse_multiline_statement(self) -> FunctionDef | For | If | While:
         keyword = self.current().string
@@ -520,16 +519,13 @@ def parse_literal(self) -> Expression:
                     return Constant(None)
 
                 return Name(token.string)
-
-            else:
-                raise ParseError(f"Unexpected keyword {token.string!r}", self.index - 1)
+            raise ParseError(f"Unexpected keyword {token.string!r}", self.index - 1)
 
         if self.match_type(TokenType.NUMBER):
             token = self.current()
             if token.string.isdigit():
                 return Constant(int(token.string))
-            else:
-                return Constant(float(token.string))
+            return Constant(float(token.string))
 
         if self.match_type(TokenType.STRING):
             token = self.current()

src/interpreted/tokenizer.py

@@ -226,7 +226,7 @@ def scan_string(self, quote_char: str) -> None:
                 self.advance()
                 self.add_token(TokenType.STRING)
                 return
-            elif not is_multiline and char == quote_char:
+            if not is_multiline and char == quote_char:
                 self.add_token(TokenType.STRING)
                 return