* HCLReconstructor._reconstruct_token - handle 0 length tokens

* FunctionCallRule.serialize - properly serialize into dollar string
* remove unused import

Author: kkozik-amplify

hcl2/rule_transformer/reconstructor.py

@@ -167,7 +167,8 @@ def _reconstruct_token(self, token: Token, parent_rule_name: str = None) -> str:
             result = " " + result
 
         self._last_token_name = token.type
-        self._last_was_space = result[-1].endswith(" ") or result[-1].endswith("\n")
+        if len(token) != 0:
+            self._last_was_space = result[-1].endswith(" ") or result[-1].endswith("\n")
 
         return result
 

hcl2/rule_transformer/rules/containers.py

@@ -1,4 +1,3 @@
-import json
 from typing import Tuple, List, Optional, Union, Any
 
 from hcl2.rule_transformer.rules.abstract import LarkRule

hcl2/rule_transformer/rules/functions.py

@@ -89,10 +89,9 @@ def arguments(self) -> Optional[ArgumentsRule]:
     def serialize(
         self, options=SerializationOptions(), context=SerializationContext()
     ) -> Any:
-        result = f"{'::'.join(identifier.serialize(options, context) for identifier in self.identifiers)}"
-        result += (
-            f"({self.arguments.serialize(options, context) if self.arguments else ''})"
-        )
+        with context.modify(inside_dollar_string=True):
+            result = f"{'::'.join(identifier.serialize(options, context) for identifier in self.identifiers)}"
+            result += f"({self.arguments.serialize(options, context) if self.arguments else ''})"
 
         if not context.inside_dollar_string:
             result = to_dollar_string(result)