Merge pull request #111 from 15r10nk/one_line_string

feat: strings with one line-break at the end stay single-quoted strings

.github/workflows/ci.yml

@@ -46,6 +46,7 @@ jobs:
       with:
         name: coverage
         path: .coverage.*
+        include-hidden-files: true
 
   combine_coverage:
     name: combine coverage and check for 100%

src/inline_snapshot/_utils.py

@@ -126,7 +126,9 @@ def map_string(tok):
         """Convert strings with newlines in triple quoted strings."""
         if tok.type == token.STRING:
             s = ast.literal_eval(tok.string)
-            if isinstance(s, str) and "\n" in s:
+            if isinstance(s, str) and (
+                ("\n" in s and s[-1] != "\n") or s.count("\n") > 1
+            ):
                 # unparse creates a triple quoted string here,
                 # because it thinks that the string should be a docstring
                 tripple_quoted_string = triple_quote(s)

tests/test_inline_snapshot.py

@@ -686,21 +686,24 @@ def test_string_newline(check_update):
 
 def test_string_quote_choice(check_update):
     assert check_update(
-        "s = snapshot(\" \\'\\'\\' \\'\\'\\' \\\"\\\"\\\"\\n\")", flags="update"
+        "s = snapshot(\" \\'\\'\\' \\'\\'\\' \\\"\\\"\\\"\\nother_line\")",
+        flags="update",
     ) == snapshot(
         '''\
 s = snapshot("""\\
  \'\'\' \'\'\' \\"\\"\\"
+other_line\\
 """)\
 '''
     )
 
     assert check_update(
-        's = snapshot(" \\\'\\\'\\\' \\"\\"\\" \\"\\"\\"\\n")', flags="update"
+        's = snapshot(" \\\'\\\'\\\' \\"\\"\\" \\"\\"\\"\\nother_line")', flags="update"
     ) == snapshot(
         """\
 s = snapshot('''\\
  \\'\\'\\' \"\"\" \"\"\"
+other_line\\
 ''')\
 """
     )
@@ -714,6 +717,49 @@ def test_string_quote_choice(check_update):
 '''
     )
 
+    assert check_update(
+        "s=snapshot('\\n')", flags="update", reported_flags=""
+    ) == snapshot("s=snapshot('\\n')")
+    assert check_update(
+        "s=snapshot('abc\\n')", flags="update", reported_flags=""
+    ) == snapshot("s=snapshot('abc\\n')")
+    assert check_update("s=snapshot('abc\\nabc')", flags="update") == snapshot(
+        '''\
+s=snapshot("""\\
+abc
+abc\\
+""")\
+'''
+    )
+    assert check_update("s=snapshot('\\nabc')", flags="update") == snapshot(
+        '''\
+s=snapshot("""\\
+
+abc\\
+""")\
+'''
+    )
+    assert check_update("s=snapshot('a\\na\\n')", flags="update") == snapshot(
+        '''\
+s=snapshot("""\\
+a
+a
+""")\
+'''
+    )
+
+    assert (
+        check_update(
+            '''\
+s=snapshot("""\\
+a
+""")\
+''',
+            flags="update",
+        )
+        == snapshot('s=snapshot("a\\n")')
+    )
+
 
 @given(s=text())
 def test_string_convert(s):