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.

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

Indentation rule rewrite #1682

Merged
merged 103 commits into from
Oct 25, 2022

Commits on Aug 21, 2022

  1. wip

    paul-dingemans committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    01aea25 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2022

  1. wip

    paul-dingemans committed Aug 27, 2022
    Configuration menu
    Copy the full SHA
    d1fbc59 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2022

  1. Configuration menu
    Copy the full SHA
    e306fb6 View commit details
    Browse the repository at this point in the history
  2. wip

    paul-dingemans committed Sep 4, 2022
    Configuration menu
    Copy the full SHA
    8eb5b67 View commit details
    Browse the repository at this point in the history
  3. fix when

    paul-dingemans committed Sep 4, 2022
    Configuration menu
    Copy the full SHA
    cb83fd5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c81c49b View commit details
    Browse the repository at this point in the history
  5. fix function call

    paul-dingemans committed Sep 4, 2022
    Configuration menu
    Copy the full SHA
    54f172c View commit details
    Browse the repository at this point in the history
  6. fix parameter list

    paul-dingemans committed Sep 4, 2022
    Configuration menu
    Copy the full SHA
    114561b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    2fcb838 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2022

  1. Configuration menu
    Copy the full SHA
    10d7760 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6f2ca7a View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. Configuration menu
    Copy the full SHA
    2e928dd View commit details
    Browse the repository at this point in the history
  2. Fix annotated class

    paul-dingemans committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    37bd13a View commit details
    Browse the repository at this point in the history
  3. Fix binary expression

    paul-dingemans committed Sep 7, 2022
    Configuration menu
    Copy the full SHA
    669edf6 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2022

  1. Configuration menu
    Copy the full SHA
    ed02409 View commit details
    Browse the repository at this point in the history
  2. Cleanup

    paul-dingemans committed Sep 8, 2022
    Configuration menu
    Copy the full SHA
    be1a58c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2863e9a View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2022

  1. Configuration menu
    Copy the full SHA
    7ed665a View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2022

  1. Configuration menu
    Copy the full SHA
    224db73 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2022

  1. Configuration menu
    Copy the full SHA
    f393560 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2022

  1. Fix while condition - WIP3 - Has failing tests in IF/WHILE which must…

    … be fixed inside binary expression
    paul-dingemans committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    f3097b5 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2022

  1. Fix while condition

    paul-dingemans committed Sep 29, 2022
    Configuration menu
    Copy the full SHA
    a5bfcec View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2022

  1. Configuration menu
    Copy the full SHA
    0e6028e View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2022

  1. Fix if-else statement and property assignment for the if-else branche…

    …s are not wrapped in blocks
    paul-dingemans committed Oct 1, 2022
    Configuration menu
    Copy the full SHA
    24feff8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    990bb0c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cf26fbe View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4e7ace5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3ef14ce View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2022

  1. Configuration menu
    Copy the full SHA
    2d1c2e6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a7c573d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4cb616e View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2022

  1. Replace handling of BLOCK element type with LBRACE/RBRACE and rework …

    …indenting of DOT QUALIFIED EXPRESSION
    paul-dingemans committed Oct 5, 2022
    Configuration menu
    Copy the full SHA
    e89eb25 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    18e9d2c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f01a563 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2022

  1. Fix WHERE/TYPE_CONSTRAINT_LIST, replace indentLevel based indenting w…

    …ith string based indents for more flexibility
    paul-dingemans committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    f439f13 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5ad556b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    aea9ec1 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2022

  1. Configuration menu
    Copy the full SHA
    b4ca39b View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2022

  1. Set indent of first and last child in indent context explicitly when …

    …creating the indent context
    paul-dingemans committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    47deaa6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    069bb11 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ddbb7f0 View commit details
    Browse the repository at this point in the history
  4. Fix if

    paul-dingemans committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    c13f772 View commit details
    Browse the repository at this point in the history
  5. Change tests to newIndentationRuleAssertThat. Remove two tests which …

    …also depend on the WrappingRule; those tests now only exist in the WrappingRuleTest class.
    paul-dingemans committed Oct 14, 2022
    Configuration menu
    Copy the full SHA
    adef09a View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2022

  1. Configuration menu
    Copy the full SHA
    92878e8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    63843d6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e188175 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    afa3765 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7e4c22e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    70e60d3 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    e971fcf View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d179320 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    cf16572 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    4596eda View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    09ce157 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2022

  1. Configuration menu
    Copy the full SHA
    b38b929 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    62f020b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b5d2d69 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f45703a View commit details
    Browse the repository at this point in the history
  5. Cleanup

    paul-dingemans committed Oct 16, 2022
    Configuration menu
    Copy the full SHA
    db6fc86 View commit details
    Browse the repository at this point in the history
  6. Replace implementation of IndentationRule with the new implementation…

    … and delete the old temporary class
    paul-dingemans committed Oct 16, 2022
    Configuration menu
    Copy the full SHA
    1b467e7 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    da04443 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    85da608 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    018caef View commit details
    Browse the repository at this point in the history
  10. Fix arrays

    paul-dingemans committed Oct 16, 2022
    Configuration menu
    Copy the full SHA
    3dbcce2 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    84ca35c View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    06cd682 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2022

  1. Configuration menu
    Copy the full SHA
    b3b3dbf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    37658dc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    73c8fa2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1753752 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2022

  1. Configuration menu
    Copy the full SHA
    c847a9d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c68beea View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2022

  1. Configuration menu
    Copy the full SHA
    91c3c29 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cff396a View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2022

  1. Fix WrappingRule and insert newline before closing quotes in a STRING…

    …_TEMPLATE_ENTRY instead of in REGULAR_STRING_PART
    paul-dingemans committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    f13682c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    655671c View commit details
    Browse the repository at this point in the history
  3. Refactor

    paul-dingemans committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    4267e45 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ee715b8 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2022

  1. Configuration menu
    Copy the full SHA
    8e19e84 View commit details
    Browse the repository at this point in the history
  2. Refactor WHILE

    paul-dingemans committed Oct 22, 2022
    Configuration menu
    Copy the full SHA
    d97e22d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bfd136f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cc5285b View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2022

  1. Configuration menu
    Copy the full SHA
    3804ff6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    399d944 View commit details
    Browse the repository at this point in the history
  3. refactor

    paul-dingemans committed Oct 23, 2022
    Configuration menu
    Copy the full SHA
    957df0d View commit details
    Browse the repository at this point in the history
  4. refactor

    paul-dingemans committed Oct 23, 2022
    Configuration menu
    Copy the full SHA
    ce2dcf1 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d58dd92 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    849e99f View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    62960b1 View commit details
    Browse the repository at this point in the history
  8. Fix for loop

    paul-dingemans committed Oct 23, 2022
    Configuration menu
    Copy the full SHA
    cffa659 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    02c2093 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    f6b794e View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    96ef63b View commit details
    Browse the repository at this point in the history
  12. Fix WHEN and ELSE

    paul-dingemans committed Oct 23, 2022
    Configuration menu
    Copy the full SHA
    647a5a6 View commit details
    Browse the repository at this point in the history
  13. Fix lint violation

    paul-dingemans committed Oct 23, 2022
    Configuration menu
    Copy the full SHA
    947e717 View commit details
    Browse the repository at this point in the history
  14. Fix when

    paul-dingemans committed Oct 23, 2022
    Configuration menu
    Copy the full SHA
    5fa9d7e View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2022

  1. Configuration menu
    Copy the full SHA
    66282a9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    139917c View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into indentation-rule-rewrite

    # Conflicts:
    #	ktlint-reporter-plain/src/main/kotlin/com/pinterest/ktlint/reporter/plain/PlainReporter.kt
    #	ktlint-ruleset-standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRule.kt
    #	ktlint-ruleset-standard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/IndentationRuleTest.kt
    #	ktlint-test/src/main/kotlin/com/pinterest/ktlint/test/RuleExtension.kt
    paul-dingemans committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    b68e3cf View commit details
    Browse the repository at this point in the history
  4. Update changelog

    paul-dingemans committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    3576dc0 View commit details
    Browse the repository at this point in the history
  5. Fix lint violations

    paul-dingemans committed Oct 24, 2022
    Configuration menu
    Copy the full SHA
    0291bb2 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2022

  1. Annotation entries inside an annotation should not be indented to avo…

    …id conflict with IntelliJ IDEA default formatting
    
    Closes 1682
    Closes 1321
    Closes 1200
    Closes 1562
    Closes 1563
    Closes 1639
    paul-dingemans committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    9e69e3e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1851f77 View commit details
    Browse the repository at this point in the history