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

Fix the handling of # fmt: skip when it's at a colon line. #3148

Merged
merged 7 commits into from Jul 19, 2022
Merged

Fix the handling of # fmt: skip when it's at a colon line. #3148

merged 7 commits into from Jul 19, 2022

Commits on Jun 30, 2022

  1. Fix the handling of # fmt: skip when it's at a colon line. 

    When the Leaf node with `# fmt: skip` is a NEWLINE inside a `suite` Node, the nodes to ignore should be from the siblings of the parent `suite` Node.

There is a also a special case for the ASYNC token, where it expands to the grandparent Node where the ASYNC token is.

This fixes psf#2646, psf#3126, psf#2680, psf#2421, psf#2339, psf#2138.
    @yilei
    yilei committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    2cf8557 View commit details
    Browse the repository at this point in the history

  2. Add an entry to the changelog.

    @yilei
    yilei committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    e42a877 View commit details
    Browse the repository at this point in the history

  3. Fix lint errors, mypy comments, and typo.

    @yilei
    yilei committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    94a6ff0 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2022

  1. Fix typo in the comment.

    @yilei
    yilei committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    6c9215a View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2022

  1. Merge branch 'main' into fmtskip

    @yilei
    yilei committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    16b23bc View commit details
    Browse the repository at this point in the history

  2. Extract a separate function to handle the # fmt: skip comment.

    @yilei
    yilei committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    92b4a4b View commit details
    Browse the repository at this point in the history

  3. Return early in the _generate_ignored_nodes_from_fmt_skip function.

    @yilei
    yilei committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    6551e01 View commit details
    Browse the repository at this point in the history