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

Bugfix. NPE in indentation rule(#555) #596

Merged
merged 6 commits into from
Dec 3, 2020
Merged

Bugfix. NPE in indentation rule(#555) #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7f1730f
bugfix/npe-indentation-rule(#555)
aktsay6 Dec 1, 2020
f9b309c
* Fixed bugs
aktsay6 Dec 1, 2020
d9d7b1b
bugfix/npe-indentation-rule(#555)
aktsay6 Dec 1, 2020
c797494
Merge branch 'master' into bugfix/npe-indentation-rule(#555)
aktsay6 Dec 1, 2020
bb17854
Merge branch 'master' into bugfix/npe-indentation-rule(#555)
aktsay6 Dec 3, 2020
7c47535
bugfix/npe-indentation-rule(#555)
aktsay6 Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/Checkers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ import org.jetbrains.kotlin.psi.psiUtil.siblings
*/
internal class AssignmentOperatorChecker(configuration: IndentationConfig) : CustomIndentationChecker(configuration) {
override fun checkNode(whiteSpace: PsiWhiteSpace, indentError: IndentationError): CheckResult? {
val prevNode = whiteSpace.prevSibling.node
if (prevNode.elementType == EQ && prevNode.treeNext.let { it.elementType == WHITE_SPACE && it.textContains('\n') }) {
val prevNode = whiteSpace.prevSibling?.node
if (prevNode?.elementType == EQ && prevNode.treeNext.let { it.elementType == WHITE_SPACE && it.textContains('\n') }) {
return CheckResult.from(indentError.actual, (whiteSpace.parentIndent()
?: indentError.expected) + (if (configuration.extendedIndentAfterOperators) 2 else 1) * configuration.indentationSize, true)
}
Expand Down Expand Up @@ -256,8 +256,8 @@ internal class CustomGettersAndSettersChecker(config: IndentationConfig) : Custo
*/
internal class ArrowInWhenChecker(configuration: IndentationConfig) : CustomIndentationChecker(configuration) {
override fun checkNode(whiteSpace: PsiWhiteSpace, indentError: IndentationError): CheckResult? {
val prevNode = whiteSpace.prevSibling.node
if (prevNode.elementType == ARROW && whiteSpace.parent is KtWhenEntry) {
val prevNode = whiteSpace.prevSibling?.node
if (prevNode?.elementType == ARROW && whiteSpace.parent is KtWhenEntry) {
return CheckResult.from(indentError.actual, (whiteSpace.parentIndent()
?: indentError.expected) + configuration.indentationSize, true)
}
Expand Down
8 changes: 8 additions & 0 deletions ...src/test/resources/test/chapter6/compact_initialization/ApplyWithValueArgumentExpected.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,12 @@ httpClient.doRequest()

fun setDefaultUrl(httpClient: HttpClient) {
httpClient.url = "http://example.com"
}

fun foo() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would add check tests too

val diktatExtension = project.extensions.create(DIKTAT_EXTENSION, DiktatExtension::class.java).apply {
inputs = project.fileTree("src").apply {
include("**/*.kt")
}
reporter = PlainReporter(System.out)}
}
8 changes: 8 additions & 0 deletions ...les/src/test/resources/test/chapter6/compact_initialization/ApplyWithValueArgumentTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,12 @@ httpClient.doRequest()

fun setDefaultUrl(httpClient: HttpClient) {
httpClient.url = "http://example.com"
}

fun foo() {
val diktatExtension = project.extensions.create(DIKTAT_EXTENSION, DiktatExtension::class.java)
diktatExtension.inputs = project.fileTree("src").apply {
include("**/*.kt")
}
diktatExtension.reporter = PlainReporter(System.out)
}