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

Squiz/BlockComment: fix fixer conflict and more #1717

Merged
merged 9 commits into from
Mar 9, 2018
Merged

Squiz/BlockComment: fix fixer conflict and more #1717

merged 9 commits into from
Mar 9, 2018

Commits on Feb 27, 2018

  1. Squiz/BlockComment: add additional unit test (fails)

    @jrfnl
    jrfnl committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    c8f1ff7 View commit details
    Browse the repository at this point in the history

  2. Squiz/BlockComment: correctly recognize the end of a block comment 

    This fixes a fixer conflict when a second block comment is directly after a first.
    @jrfnl
    jrfnl committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    709ad41 View commit details
    Browse the repository at this point in the history

  3. Squiz/BlockComment: improve empty comment recognition 

    If an empty comment was indented with tabs instead of spaces, it would not be recognized as empty.
    @jrfnl
    jrfnl committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    5d0e241 View commit details
    Browse the repository at this point in the history

  4. Squiz/BlockComment: allow for star prefixed lines in a block comment

    @jrfnl
    jrfnl committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    fd96953 View commit details
    Browse the repository at this point in the history

  5. Squiz/BlockComment: don't presume expected number of spaces will be m… 

    …ultiple of tab width
    @jrfnl
    jrfnl committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    5ea5103 View commit details
    Browse the repository at this point in the history

  6. Squiz/BlockComment: add fixer for LastLineIndent error

    @jrfnl
    jrfnl committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    c24f544 View commit details
    Browse the repository at this point in the history

  7. Squiz/BlockComment: minor efficiency fixes 

    Don't duplicate function calls already made.
    @jrfnl
    jrfnl committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    a15dd0a View commit details
    Browse the repository at this point in the history

  8. Squiz/BlockComment: don't autofix mid-line inline comments 

    This was causing fixer conflicts with other sniffs dealing with code whitespace rules.
    @jrfnl
    jrfnl committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    d735ce8 View commit details
    Browse the repository at this point in the history

  9. Squiz/BlockComment: fix issue with PHPCS annotations causing the comm… 

    …ent closer to be misidentified.

Whether something was identified as a comment line was based on the token code being the same.
This did not allow for PHPCS annotations to be included in block comments as those have a different token code.

This resulted in comments being "cut short", i.e. the line above a PHPCS annotation being seen as the last line in a comment and subsequent comment lines being ignored, resulting in incorrect `Comment closer must be on a new line` and `Empty line required after block comment` notices.

Fixes 1918
    @jrfnl
    jrfnl committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    ce2b0fe View commit details
    Browse the repository at this point in the history