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

NPE is ASTNode.squeezeSpaces method #500

Merged
merged 8 commits into from
Nov 16, 2020
Merged

NPE is ASTNode.squeezeSpaces method #500

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d2451c
NPE is ASTNode.squeezeSpaces method
kentr0w Nov 6, 2020
bbd93c2
NPE is ASTNode.squeezeSpaces method
kentr0w Nov 7, 2020
bf5c999
NPE is ASTNode.squeezeSpaces method
kentr0w Nov 7, 2020
ae8baa1
NPE is ASTNode.squeezeSpaces method
kentr0w Nov 9, 2020
604908a
NPE is ASTNode.squeezeSpaces method
kentr0w Nov 10, 2020
1b13ee7
NPE is ASTNode.squeezeSpaces method
kentr0w Nov 13, 2020
6796788
NPE is ASTNode.squeezeSpaces method
kentr0w Nov 13, 2020
e031d16
Merge branch 'master' into bugfix/npe-smokeTest-squeezeSpaces
kentr0w Nov 16, 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
2 changes: 1 addition & 1 deletion diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/CommentsFormatting.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ class CommentsFormatting(private val configRules: List<RulesConfig>) : Rule("kdo
}

private fun checkSpaceBetweenPropertyAndComment(node: ASTNode, configuration: CommentsFormattingConfiguration) {
if (node.treeParent.firstChildNode != node) {
if (node.treeParent.firstChildNode != node && node.treeParent.elementType != FILE) {
kentr0w marked this conversation as resolved.
Show resolved Hide resolved
if (!node.treePrev.isWhiteSpace()) {
// if comment is like this: val a = 5// Comment
COMMENT_WHITE_SPACE.warnAndFix(configRules, emitWarn, isFixMode,
Expand Down
4 changes: 4 additions & 0 deletions diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example3Expected.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package org.cqfn.diktat

/*
* Copyright (c) Your Company Name Here. 2010-2020
*/

/**
* @property name
*/
Expand Down
4 changes: 3 additions & 1 deletion diktat-rules/src/test/resources/test/smoke/src/main/kotlin/Example3Test.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
package test.smoke.src.main.kotlin
/*
* Copyright (c) Your Company Name Here. 2010-2020
*/

class HttpClient {
var name: String
Expand Down