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

[pull] master from pinterest:master #106

Open
wants to merge 1,197 commits into
base: master
Choose a base branch
from
Open

Conversation

pull[bot]
Copy link

@pull pull bot commented Oct 5, 2021

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Oct 5, 2021
paul-dingemans and others added 29 commits December 2, 2023 14:35
…ators` (#2401)

* Add experimental ConditionWrappingRule and MixedConditionOperatorsRule
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
#2404)

* fix(deps): update dependency ch.qos.logback:logback-classic to v1.3.13

Closes #2396

* Configure renovate to not update to logback-classic to 1.4 as long as java8 is to be supported
… with backticks (#2405)

* Allow property, function and class name to be same as keyword wrapped with backticks

Closes #2352
#2406)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Simplify `max-line-length` implementation
…2409)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…ch a newline can be inserted to fix the violation (#2419)
* Extract KtlintSuppression from KtlintSuppressionRule

KtlintSuppression is able to insert or modify a 'Suppress' annotation for a given node. It has no knowledge of the legacy ktlint-directives. The KtlintSuppressionRule handles the legacy ktlint-directives and delegates insertion/modification of the 'Suppress' annotation to the KtlintSuppression helper.

KtlintSuppressionRule:
* Fix offsets in some violations
* Allow annotation to be placed on a value argument, value parameter, type projection or type parameter
…signature` rules as both deal with wrapping parameters. (#2433)

Closes #2424
* Fix headings of tips and notes

Closes #2434

* Fix scripts to run mkdocs locally
This better demonstrates generating config for different code styles, as per #2436 (comment).
….1.4 (#2439)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…2442)

* Suppress property-naming rule via `@Suppress("ConstPropertyName")`

Suppression via `@Suppress("PropertyName")` was already supported before.

Closes #2441
Co-authored-by: Ktlint Release Workflow <>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate bot and others added 30 commits August 9, 2024 17:14
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Replaced occurrences of `int` with `Int` in Kotlin code snippets to align with Kotlin's type system, which uses non-primitive types. The previous examples contained errors due to the use of `int`, which does not exist in Kotlin. This change ensures the code is syntactically correct and consistent with Kotlin's type conventions.
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
https://github.com/GradleUp/shadow/releases/tag/8.3.0

Co-authored-by: Paul Dingemans <paul-dingemans@users.noreply.github.com>
….0 (#2769)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Update gradle/actions action to v4

* Update gradle/actions to v4

- Remove explicit gradle wrapper-validation as this is now done by setup-gradle-build action

Closes #2760

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Paul Dingemans <paul-dingemans@users.noreply.github.com>
…n-signature` (#2775)

When `function-signature` rule is configured with `ktlint_function_signature_body_expression_wrapping` set to `default` then the first line of a multiline expression body should be kept on the same line as the end of function signature, as long as max line length is not exceeded. In this case the `multiline-expression-wrapping` rule has to ignore the multiline function expression body.

Closes #2650
…abled (#2783)

* Align EditorConfig settings for `max_line_length` and enable/disabling the `max-line-length` rule

IMPORTANT: Potential breaking change for API Consumers that provide the `max_line_length` property but not enabling/providing the `max-line-length` rule of the Ktlint standard rule set.

Rules should only consider the maximum line length in case property `max_line_length` is set to a value between 0 and `MAX_INTEGER - 1`, and the `max-line-length` rule is provided to the KtLintRuleEngine, and the `max-line-length` rule is enabled.

It should not be enforced that property `max_line_length` should have value `unset` or `off` whenever the `max-line-length` rule is disabled, or not provided to the KtLintRuleEngine. This property is also used by IntelliJ IDEA to display the right margin where lines should be wrapped. A user should be able to disable enforce max line length wrapping in ktlint, while still seeing the margin line in the editor.

Closes #2743

* Update documentation
* fix(deps): update kotlin monorepo to v2.0.20

* fix(deps): update dependency dev.drewhamilton.poko:poko-gradle-plugin to v0.17.0

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Paul Dingemans <paul-dingemans@users.noreply.github.com>
…eName")` (#2785)

* Suppress `backing-property-naming` rule with `@Suppress("LocalVariableName")`

* Suppress `backing-property-naming` rule with `@Suppress("LocalVariableName")`

Closes #2779
… class annotation and other class modifier (#2786)

Closes #2755
According to https://git-scm.com/docs/gitignore a trailing `**` in a glob has to match with any file in the directory that matches the glob without that trailing `**`.

Given glob "**/Test*/**" the file "src/Foo/TestFoo.kt" should not be matched, and file "src/TestFoo/FooTest.kt" is matched. If the original pattern would be expanded with additional pattern "**/Test*" then both files would have been matched.

Closes #2781
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…hanged (#2803)

In very rare cases it is possible that Lint violations are detected while formatting but that they have opposite effects and the file gets not altered at all. As the logging already might contain the message "Format was not able to resolve all violations which (theoretically) can be autocorrected in file ..." the format may not return with exit code 0.

Closes #2795
… to v0.17.1 (#2799)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Remove calls to `KtTokens.HEADER_KEYWORD` & `KtTokens.IMPL_KEYWORD`.
These have been removed from Kotlin effective Kotlin 2.1.0-Beta1.
* fix(deps): update dependency com.github.ajalt.clikt:clikt to v5

* Upgrade com.github.ajalt.clikt:clikt to v5

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Paul Dingemans <paul-dingemans@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
….1 (#2815)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.