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

Format type hints after comments #3362

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

Format type hints after comments #3362

wants to merge 24 commits into from
+156 −9

Commits on Oct 27, 2022

  1. Add comma split before delimiter split 

    This fixes psf#3350.
    @charlie572
    charlie572 committed Oct 27, 2022
    Configuration menu
    Copy the full SHA
    08c9138 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2022

  1. Refactor comma_split() and delimiter_split()

    @charlie572
    charlie572 committed Oct 28, 2022
    Configuration menu
    Copy the full SHA
    42f3595 View commit details
    Browse the repository at this point in the history

  2. Add to CHANGES.md

    @charlie572
    charlie572 committed Oct 28, 2022
    Configuration menu
    Copy the full SHA
    c2eb395 View commit details
    Browse the repository at this point in the history

  3. Add comma_split() to developer reference

    @charlie572
    charlie572 committed Oct 28, 2022
    Configuration menu
    Copy the full SHA
    2ec9eda View commit details
    Browse the repository at this point in the history

  4. Reformat linegen.py

    @charlie572
    charlie572 committed Oct 28, 2022
    Configuration menu
    Copy the full SHA
    8ae3b7c View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2022

  1. Handle other cases of comments in brackets 

    This commit makes Black handle cases where there is a comment in the
middle of a statement in brackets. It also removes uses of comma_split()
    @charlie572
    charlie572 committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    54b511a View commit details
    Browse the repository at this point in the history

  2. Revert "Add comma_split() to developer reference" 

    This reverts commit 2ec9eda.
    @charlie572
    charlie572 committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    a0c658d View commit details
    Browse the repository at this point in the history

  3. Revert "Add to CHANGES.md" 

    This reverts commit c2eb395.
    @charlie572
    charlie572 committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    57315e3 View commit details
    Browse the repository at this point in the history

  4. Revert "Refactor comma_split() and delimiter_split()" 

    This reverts commit 42f3595.
    @charlie572
    charlie572 committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    3742181 View commit details
    Browse the repository at this point in the history

  5. Revert "Add comma split before delimiter split" 

    This reverts commit 08c9138.
    @charlie572
    charlie572 committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    63dc442 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2022

  1. Move changes to preview

    @charlie572
    charlie572 committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    2dd9a7e View commit details
    Browse the repository at this point in the history

  2. Add to CHANGES.md

    @charlie572
    charlie572 committed Nov 1, 2022
    Configuration menu
    Copy the full SHA
    ed21fcf View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2022

  1. Merge branch 'main' into format-type-hints-after-comments

    @JelleZijlstra
    JelleZijlstra authored Nov 3, 2022
    Configuration menu
    Copy the full SHA
    7438ad1 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2022

  1. Merge branch 'main' into format-type-hints-after-comments

    @JelleZijlstra
    JelleZijlstra authored Dec 10, 2022
    Configuration menu
    Copy the full SHA
    ab14c70 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2023

  1. Merge branch 'main' into format-type-hints-after-comments 

    # Conflicts:
#	CHANGES.md
#	src/black/mode.py
    @charlie572
    charlie572 committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    2be15ac View commit details
    Browse the repository at this point in the history

  2. Edit test to make sure a delimiter split is performed 

    This test makes sure a trailing comma is added when there is a comment
in the brackets. However, a delimiter split is no longer performed in
these cases, so there is no need to add a trailing comma. This commit
makes the lines longer so a delimiter split is performed, and the
behaviour with the trailing comma can be tested.
    @charlie572
    charlie572 committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    82d05f0 View commit details
    Browse the repository at this point in the history

  3. Add comment

    @charlie572
    charlie572 committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    618eb16 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2023

  1. Handle magic trailing commas with comments

    @charlie572
    charlie572 committed Jul 2, 2023
    Configuration menu
    Copy the full SHA
    5658c39 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

  1. Remove magic trailing comma correctly

    @charlie572
    charlie572 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    de4a517 View commit details
    Browse the repository at this point in the history

  2. Rename magic trailing comma attributes 

    Magic_trailing_comma now points to the actual comma token, and
bracket_after_magic_trailing_comma now points to the following close
bracket.
    @charlie572
    charlie572 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    2ccc70f View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. Gate changes to preview

    @charlie572
    charlie572 committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    2d32616 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2023

  1. Merge branch 'main' into format-type-hints-after-comments

    @hauntsaninja
    hauntsaninja authored Jul 9, 2023
    Configuration menu
    Copy the full SHA
    4e5bf07 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

  1. Reformat

    @charlie572
    charlie572 committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    cbce271 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Merge branch 'main' into format-type-hints-after-comments

    @hauntsaninja
    hauntsaninja authored Oct 6, 2023
    Configuration menu
    Copy the full SHA
    029fce9 View commit details
    Browse the repository at this point in the history