Fix spaces appearing in lines before global paths (#14)

ErykMroczek · Nov 30, 2023 · 6d8972f · 6d8972f
2 parents 54c500f + fdc865d
commit 6d8972f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/mofmt/parsing/parser.py b/mofmt/parsing/parser.py
@@ -13,7 +13,6 @@
     ModelicaLexer.RCURLY,
     ModelicaLexer.SEMICOLON,
     ModelicaLexer.COMMA,
-    ModelicaLexer.DOT,
     ModelicaLexer.COLON,
 )
 
@@ -114,19 +113,27 @@ def visitTerminal(self, node: antlr.TerminalNode) -> None:
         # Handle special cases
         if kind == ModelicaLexer.LBRACK:
             self.bracket_counter += 1
+            if self.prev_token != ModelicaLexer.IDENT:
+                self.collector.add_space()
         elif kind == ModelicaLexer.RBRACK:
             self.bracket_counter -= 1
         elif kind == ModelicaLexer.FOR:
             self.break_or_space()
-        if kind not in NO_SPACE_BEFORE and self.prev_token not in NO_SPACE_AFTER:
+        elif kind == ModelicaLexer.DOT:
+            # Only first dot in type specifiers etc. can be preceded with a space
+            if self.prev_token not in (ModelicaLexer.IDENT, ModelicaLexer.RBRACK):
+                self.collector.add_space()
+        elif kind not in NO_SPACE_BEFORE and self.prev_token not in NO_SPACE_AFTER:
             self.collector.add_space()
+
         self.collector.add_token(token.text)
         if kind == ModelicaLexer.ANNOTATION:
             self.collector.add_space()
         self.prev_token = kind
         self.prev_token_line = line
 
     def enter_grouped_rule(self, ctx: antlr.ParserRuleContext) -> None:
+        """If the rule was wrapped add info to the stack and increase indent"""
         self.group_stack.append(False)
         if is_multiline(ctx):
             self.group_stack[-1] = True
@@ -140,6 +147,7 @@ def enter_grouped_rule(self, ctx: antlr.ParserRuleContext) -> None:
                 self.collector.add_indent()
 
     def exit_grouped_rule(self, ctx: antlr.ParserRuleContext) -> None:
+        """Decrease indent when leaving wrapped group"""
         if self.group_stack[-1]:
             if ctx.getRuleIndex() == Modelica.RULE_if_expression:
                 if get_preceding_token(ctx, self.stream).type == ModelicaLexer.EQUAL:
@@ -152,13 +160,15 @@ def exit_grouped_rule(self, ctx: antlr.ParserRuleContext) -> None:
         self.group_stack.pop()
 
     def break_or_space(self):
+        """Insert line break or space"""
         if self.group_stack[-1]:
             self.collector.add_break()
         else:
             if self.prev_token not in NO_SPACE_AFTER:
                 self.collector.add_space()
 
     def wrap_expression(self, ctx: antlr.ParserRuleContext):
+        """Wrap the expression"""
         next_token = get_following_token(ctx, self.stream)
         # Check if there was a line break around the wrap point
         if next_token.line > self.prev_token_line:
@@ -302,9 +312,6 @@ def enterEveryRule(self, ctx: antlr.ParserRuleContext) -> None:
             ):
                 self.break_or_space()
             self.wrap_stack.append(False)
-        elif rule == Modelica.RULE_type_specifier:
-            if ctx.start.type == ModelicaLexer.DOT:
-                self.collector.add_space()
 
     def exitEveryRule(self, ctx: antlr.ParserRuleContext) -> None:
         """

diff --git a/tests/style/samples/classes/classes-input.mo b/tests/style/samples/classes/classes-input.mo
@@ -79,3 +79,8 @@ end Tank;
 partial record 'Quoted "record"'
 import It.is.empty;
 end 'Quoted "record"';
+
+block Foo
+import Modelica.Units.SI;
+  .Modelica.Blocks.Interfaces.BooleanInput b;
+end Foo;
diff --git a/tests/style/samples/classes/classes-output.mo b/tests/style/samples/classes/classes-output.mo
@@ -105,3 +105,10 @@ partial record 'Quoted "record"'
   import It.is.empty;
 
 end 'Quoted "record"';
+
+block Foo
+
+  import Modelica.Units.SI;
+  .Modelica.Blocks.Interfaces.BooleanInput b;
+
+end Foo;