Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions tests/test_items.py
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,35 @@ def test_array_add_line() -> None:
)


def test_array_add_line_trailing_comment_does_not_hide_bracket() -> None:
t = api.array()
t.add_line("foo", comment="bar")

assert (
t.as_string()
== """[
"foo", # bar
]"""
)

doc = api.document()
doc.add("array", t)
assert parse(doc.as_string())["array"] == ["foo"]


def test_array_add_line_trailing_comment_closing_line_is_not_doubled() -> None:
t = api.array()
t.add_line("foo", comment="bar")
t.add_line(indent="")

assert (
t.as_string()
== """[
"foo", # bar
]"""
)


def test_array_add_line_multiline_comment_is_rejected() -> None:
t = api.array()
with pytest.raises(ValueError, match="line breaks"):
Expand Down
8 changes: 7 additions & 1 deletion tomlkit/items.py
Original file line number Diff line number Diff line change
Expand Up @@ -1464,7 +1464,13 @@ def multiline(self, multiline: bool) -> Array:

def as_string(self) -> str:
if not self._multiline or not self._value:
return f"[{''.join(v.as_string() for v in self._iter_items())}]"
items = list(self._iter_items())
body = "".join(v.as_string() for v in items)
if items and isinstance(items[-1], Comment):
# A comment runs to the end of the line, so the closing bracket
# has to start a new one or it would be commented out.
body += "\n" + self.trivia.indent
return f"[{body}]"

s = "[\n"
s += "".join(
Expand Down