Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3608] Fix using multiple fmt:skip pragmas in a single block #3978

Open
wants to merge 31 commits into
base: main
Choose a base branch
from
Open

[3608] Fix using multiple fmt:skip pragmas in a single block #3978

wants to merge 31 commits into from

Commits on Oct 25, 2023

  1. Remove redundant check

    @henriholopainen
    henriholopainen committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    24801a9 View commit details
    Browse the repository at this point in the history

  2. Small refactor

    @henriholopainen
    henriholopainen committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    4224336 View commit details
    Browse the repository at this point in the history

  3. Small refactor

    @henriholopainen
    henriholopainen committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    b435b3a View commit details
    Browse the repository at this point in the history

  4. Small refactor

    @henriholopainen
    henriholopainen committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    c212649 View commit details
    Browse the repository at this point in the history

  5. Refactor

    @henriholopainen
    henriholopainen committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    c574b97 View commit details
    Browse the repository at this point in the history

  6. Refactor

    @henriholopainen
    henriholopainen committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    c1c4d63 View commit details
    Browse the repository at this point in the history

  7. Refactor + rewrite docstrings

    @henriholopainen
    henriholopainen committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    e78b18f View commit details
    Browse the repository at this point in the history

  8. Simplify

    @henriholopainen
    henriholopainen committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    2e66960 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. Move if closer to where it can happen

    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    4dfdc0f View commit details
    Browse the repository at this point in the history

  2. Wording

    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    fe9a810 View commit details
    Browse the repository at this point in the history

  3. Remove unnecessary check (is handled by checking empty ignored_nodes)

    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    92bece5 View commit details
    Browse the repository at this point in the history

  4. Move logical block closer to relevant code

    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    20a18aa View commit details
    Browse the repository at this point in the history

  5. Split fmt_off and fmt_skip logic to separate functions

    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    f096ae7 View commit details
    Browse the repository at this point in the history

  6. Add new test case

    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    31b68e1 View commit details
    Browse the repository at this point in the history

  7. Rename

    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    0d43b9e View commit details
    Browse the repository at this point in the history

  8. Fix falsy test

    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    035704d View commit details
    Browse the repository at this point in the history

  9. Add test case

    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    9799ec8 View commit details
    Browse the repository at this point in the history

  10. Add heuristic to use correct sibling/preceding leaf 

    In cases where 'fmt:skip' belonged to a closing bracket, prev_sibling would give us the opening bracket instead of the previous element inside the brackets. This is desirable if the whole thing is on the same line (as that is what fmt:skip targets), but in other cases we actually want to start processing the preceding leaf instead.
    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    813cef5 View commit details
    Browse the repository at this point in the history

  11. Changelog entry

    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    397aa1c View commit details
    Browse the repository at this point in the history

  12. Update PR number

    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    5ac05c0 View commit details
    Browse the repository at this point in the history

  13. Update docs

    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    be040e6 View commit details
    Browse the repository at this point in the history

  14. Add more test cases

    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    71ca016 View commit details
    Browse the repository at this point in the history

  15. Fix another corner case (psf#3682) 

    Here we enable the backtracking to reach preceding leafs even outside the same parent. As long as they are on the same line, it should be fine, as  is supposed to target the whole line.
    @henriholopainen
    henriholopainen committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    d232f7b View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. Remove check that can never happen

    @henriholopainen
    henriholopainen committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    beefa04 View commit details
    Browse the repository at this point in the history

  2. Expand test case

    @henriholopainen
    henriholopainen committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    422178d View commit details
    Browse the repository at this point in the history

  3. Get rid of special cases and combine to one branch

    @henriholopainen
    henriholopainen committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    a8e6373 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. Merge branch 'main' into issue_3608

    @henriholopainen
    henriholopainen authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    05f33ce View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. Merge branch 'main' into issue_3608

    @JelleZijlstra
    JelleZijlstra authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    84140e9 View commit details
    Browse the repository at this point in the history

  2. Update CHANGES.md

    @JelleZijlstra
    JelleZijlstra authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    58e011b View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Merge branch 'main' into issue_3608

    @henriholopainen
    henriholopainen authored Nov 8, 2023
    Configuration menu
    Copy the full SHA
    13c23b7 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2023

  1. Merge branch 'main' into issue_3608

    @henriholopainen
    henriholopainen authored Nov 18, 2023
    Configuration menu
    Copy the full SHA
    14d7021 View commit details
    Browse the repository at this point in the history