Fix fmt: skip skipping the line after instead of the line it's on (#4855)

* Fix `fmt: skip` skipping the line after instead of the line it's on (#3364, #4366)

Signed-off-by: cobalt <61329810+cobaltt7@users.noreply.github.com>

* Apply suggestion from @cobaltt7

* Add tests

Signed-off-by: cobalt <61329810+cobaltt7@users.noreply.github.com>

* Fix error on preview when only the closing bracket was ignored

Signed-off-by: cobalt <61329810+cobaltt7@users.noreply.github.com>

* Fix merge conflict

Signed-off-by: cobalt <61329810+cobaltt7@users.noreply.github.com>

* If i fully gate it under fix_fmt_skip_in_one_liners it works

Signed-off-by: cobalt <61329810+cobaltt7@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix should-be final issues

Signed-off-by: cobalt <61329810+cobaltt7@users.noreply.github.com>

---------

Signed-off-by: cobalt <61329810+cobaltt7@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: cobaltt7

CHANGES.md

@@ -22,6 +22,7 @@
 
 <!-- Changes that affect Black's preview style -->
 
+- Fix `fmt: skip` skipping the line after instead of the line it's on (#4855)
 - Remove unnecessary parentheses from the left-hand side of assignments while preserving
   magic trailing commas and intentional multiline formatting (#4865)
 - Fix `fix_fmt_skip_in_one_liners` crashing on `with` statements (#4853)

src/black/comments.py

@@ -605,6 +605,10 @@ def _generate_ignored_nodes_from_fmt_skip(
     comments = list_comments(leaf.prefix, is_endmarker=False, mode=mode)
     if not comments or comment.value != comments[0].value:
         return
+
+    if Preview.fix_fmt_skip_in_one_liners in mode and not prev_sibling and parent:
+        prev_sibling = parent.prev_sibling
+
     if prev_sibling is not None:
         leaf.prefix = leaf.prefix[comment.consumed :]
 
@@ -646,10 +650,20 @@ def _generate_ignored_nodes_from_fmt_skip(
             leaf_nodes = list(current_node.prev_sibling.leaves())
             current_node = leaf_nodes[-1] if leaf_nodes else current_node
 
+            if (
+                current_node.type in CLOSING_BRACKETS
+                and current_node.parent
+                and current_node.parent.type == syms.atom
+            ):
+                current_node = current_node.parent
+
             if current_node.type in (token.NEWLINE, token.INDENT):
                 current_node.prefix = ""
                 break
 
+            if current_node.type == token.DEDENT:
+                break
+
             # Special case for with expressions
             # Without this, we can stuck inside the asexpr_test's children's children
             if (

tests/data/cases/fmtskip10.py

@@ -11,3 +11,12 @@ def f(x: int): return x # fmt: skip
 while j < 10: j += 1  # fmt: skip
 
 b = [c for c in "A very long string that would normally generate some kind of collapse, since it is this long"] # fmt: skip
+
+v = (
+    foo_dict  # fmt: skip
+    .setdefault("a", {})
+    .setdefault("b", {})
+    .setdefault("c", {})
+    .setdefault("d", {})
+    .setdefault("e", {})
+)

tests/data/cases/fmtskip13.py

@@ -0,0 +1,64 @@
+# flags: --preview
+
+t = (
+    {"foo": "very long string", "bar": "another very long string", "baz": "we should run out of space by now"},  # fmt: skip
+    {"foo": "bar"},
+)
+
+t = (
+    {
+        "foo": "very long string",
+        "bar": "another very long string",
+        "baz": "we should run out of space by now",
+    },  # fmt: skip
+    {"foo": "bar"},
+)
+
+
+t = (
+    {"foo": "very long string", "bar": "another very long string", "baz": "we should run out of space by now"},  # fmt: skip
+    {"foo": "bar",},
+)
+
+t = (
+    {
+        "foo": "very long string",
+        "bar": "another very long string",
+        "baz": "we should run out of space by now",
+    },  # fmt: skip
+    {"foo": "bar",},
+)
+
+# output
+t = (
+    {"foo": "very long string", "bar": "another very long string", "baz": "we should run out of space by now"},  # fmt: skip
+    {"foo": "bar"},
+)
+
+t = (
+    {
+        "foo": "very long string",
+        "bar": "another very long string",
+        "baz": "we should run out of space by now",
+    },  # fmt: skip
+    {"foo": "bar"},
+)
+
+
+t = (
+    {"foo": "very long string", "bar": "another very long string", "baz": "we should run out of space by now"},  # fmt: skip
+    {
+        "foo": "bar",
+    },
+)
+
+t = (
+    {
+        "foo": "very long string",
+        "bar": "another very long string",
+        "baz": "we should run out of space by now",
+    },  # fmt: skip
+    {
+        "foo": "bar",
+    },
+)