Refactor building module imports and fix insert logic

Author: Евгений Блинов

metacode/__init__.py

@@ -1,4 +1,5 @@
+from metacode.building import build as build
+from metacode.building import insert as insert
 from metacode.errors import UnknownArgumentTypeError as UnknownArgumentTypeError
 from metacode.parsing import ParsedComment as ParsedComment
 from metacode.parsing import parse as parse
-from metacode.building import build as build, insert as insert

metacode/building.py

@@ -1,7 +1,7 @@
 from ast import AST
 
-from metacode.typing import EllipsisType
 from metacode import ParsedComment
+from metacode.typing import EllipsisType
 
 
 def build(comment: ParsedComment) -> str:
@@ -42,7 +42,6 @@ def insert(comment: ParsedComment, existing_comment: str, at_end: bool = False)
             return existing_comment + build(comment)
         return f'{existing_comment} {build(comment)}'
 
-    else:
-        if existing_comment.startswith(' '):
-            return f'{build(comment)}{existing_comment}'
-        return f'{build(comment)} {existing_comment}'
+    if existing_comment.startswith(' '):
+        return f'{build(comment)}{existing_comment}'
+    return f'{build(comment)} {existing_comment}'

metacode/comment.py

@@ -1,6 +1,4 @@
-from ast import AST
 from dataclasses import dataclass
-from typing import List, Optional
 
 from metacode.typing import Arguments
 

metacode/parsing.py

@@ -5,9 +5,9 @@
 from libcst import SimpleStatementLine
 from libcst import parse_module as cst_parse
 
+from metacode.comment import ParsedComment
 from metacode.errors import UnknownArgumentTypeError
 from metacode.typing import Arguments
-from metacode.comment import ParsedComment
 
 
 def get_right_part(comment: str) -> str:

metacode/typing.py

@@ -1,5 +1,5 @@
 from ast import AST
-from typing import Union, TypeAlias, List, Optional
+from typing import List, Optional, TypeAlias, Union
 
 # TODO: delete this catch block and "type: ignore" if minimum supported version of Python is > 3.9.
 try:

tests/test_building.py

@@ -3,7 +3,7 @@
 import pytest
 from full_match import match
 
-from metacode import build, insert, ParsedComment
+from metacode import ParsedComment, build, insert
 
 
 def test_run_build_with_wrong_key_or_action():