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: GhostTal/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.
  • 16 commits
  • 6 files changed
  • 8 contributors

Commits on Nov 12, 2020

  1. Track KtLint's code styles.

    vRallev committed Nov 12, 2020
    Configuration menu
    Copy the full SHA
    fbaf43b View commit details
    Browse the repository at this point in the history
  2. Merge pull request square#84 from square/ralf/track-ktlint

    Track KtLint's code styles.
    vRallev authored Nov 12, 2020
    Configuration menu
    Copy the full SHA
    b5d3e81 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2021

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

Commits on Jun 9, 2021

  1. add SUGGEST_NULLABLE_ANNOTATIONS inspection

    add ConstantConditions.SUGGEST_NULLABLE_ANNOTATIONS to inspections.
    
    This inspection flags code that mixes `@Nullable` values and
    non-`@Nullable` params. Such code is likely erroneous and a common
    place for NPEs to hide.
    thomasmahoney authored Jun 9, 2021
    Configuration menu
    Copy the full SHA
    d06cd93 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2021

  1. Merge pull request square#88 from kwonye/support-settings-repository

    Add support for settings repository
    vRallev authored Jul 1, 2021
    Configuration menu
    Copy the full SHA
    21dd5b3 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2021

  1. Merge pull request square#89 from thomasmahoney/patch-2

    add SUGGEST_NULLABLE_ANNOTATIONS inspection
    swankjesse authored Jul 12, 2021
    Configuration menu
    Copy the full SHA
    6cdf214 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2022

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

Commits on Jul 23, 2022

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

    …tax-assertions
    
    Exclude property access inspections on assertj assertions due to side-effects
    swankjesse authored Jul 23, 2022
    Configuration menu
    Copy the full SHA
    836bbaf View 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
    1af1c63 View commit details
    Browse the repository at this point in the history
  2. Merge pull request square#94 from kirillzh/zhukov/fix-trailing-commas

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

Commits on Jan 6, 2023

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

Commits on Jan 9, 2023

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

    Disable new line after multiline when statement
    swankjesse authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    63e0030 View 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 committed Nov 19, 2025
    Configuration menu
    Copy the full SHA
    66a3fc3 View commit details
    Browse the repository at this point in the history
  2. Merge pull request square#100 from square/ralf/import-layout

    Explicit Kotlin import layout
    JakeWharton authored Nov 19, 2025
    Configuration menu
    Copy the full SHA
    476d898 View 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 committed Nov 19, 2025
    Configuration menu
    Copy the full SHA
    832b5d0 View commit details
    Browse the repository at this point in the history
  4. Merge pull request square#101 from square/ralf/deprecate

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