Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository:chatbot-pf/java-code-styles
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base:main
Choose a base ref
...
head repository:square/java-code-styles
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare:main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 10 commits
  • 4 files changed
  • 6 contributors

Commits on Jul 22, 2022

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

Commits on Jul 23, 2022

  1. Merge pull requestsquare#92from tyiu/tyiu/avoid-property-access-syn…

    …tax-assertions Exclude property access inspections on assertj assertions due to side-effects
    @swankjesse
    swankjesse authored Jul 23, 2022
    Configuration menu
    Copy the full SHA
    836bbafView commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2022

  1. Fix trailing commas configuration - KTIJ-22516.

    ALLOW_TRAILING_COMMA configuration does not currently get picked up by IJ/AS, it only works if it's set up using legacy `JetCodeStyleSettings` block. See https://youtrack.jetbrains.com/issue/KTIJ-22516 for more details, enabling trailing commas via `JetCodeStyleSettings` until the IDE bug is fixed.
    Kirill Zhukov committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    1af1c63View commit details
    Browse the repository at this point in the history
  2. Merge pull requestsquare#94from kirillzh/zhukov/fix-trailing-commas

    Fix trailing commas configuration - KTIJ-22516.
    @JakeWharton
    JakeWharton authored Aug 17, 2022
    Configuration menu
    Copy the full SHA
    dfcee12View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2023

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

Commits on Jan 9, 2023

  1. Merge pull requestsquare#95from holmes/holmes/when-fix

    Disable new line after multiline when statement
    @swankjesse
    swankjesse authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    63e0030View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2025

  1. Explicit Kotlin import layout

    Specify an explicit import layout instead of relying on the Kotlin Official default. The Kotlin Official style uses `ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^`. There isn't a reason why these packages should be treated differently. The new explicit import layout changes it to `ij_kotlin_imports_layout = *`, which is for example used by ktfmt, too.
    @vRallev
    vRallev committed Nov 19, 2025
    Configuration menu
    Copy the full SHA
    66a3fc3View commit details
    Browse the repository at this point in the history
  2. Merge pull requestsquare#100from square/ralf/import-layout

    Explicit Kotlin import layout
    @JakeWharton
    JakeWharton authored Nov 19, 2025
    Configuration menu
    Copy the full SHA
    476d898View commit details
    Browse the repository at this point in the history
  3. Deprecate this project

    These code styles aren't maintained anymore. Block / Square has adopted [ktfmt](https://github.com/facebook/ktfmt) with its code style. [`.editorconfig`](https://spec.editorconfig.org/index.html) files are a better alternative to share code styles and are supported in Jetbrains IDEs.
    @vRallev
    vRallev committed Nov 19, 2025
    Configuration menu
    Copy the full SHA
    832b5d0View commit details
    Browse the repository at this point in the history
  4. Merge pull requestsquare#101from square/ralf/deprecate

    Deprecate this project
    @JakeWharton
    JakeWharton authored Nov 19, 2025
    Configuration menu
    Copy the full SHA
    bee3cc0View commit details
    Browse the repository at this point in the history
Loading