bugfix/rules-to-chapter-folders(#719)

### What's done: * Rules are now split to chapters
saveourtool · Jan 26, 2021 · ff27cad · ff27cad
1 parent c5d3db8
commit ff27cad
Show file tree

Hide file tree

Showing 174 changed files with 258 additions and 232 deletions.
diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/generation/Generation.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/generation/Generation.kt
@@ -5,9 +5,9 @@
 package org.cqfn.diktat.ruleset.generation
 
 import org.cqfn.diktat.ruleset.constants.Warnings
-import org.cqfn.diktat.ruleset.rules.comments.HeaderCommentRule.Companion.afterCopyrightRegex
-import org.cqfn.diktat.ruleset.rules.comments.HeaderCommentRule.Companion.curYear
-import org.cqfn.diktat.ruleset.rules.comments.HeaderCommentRule.Companion.hyphenRegex
+import org.cqfn.diktat.ruleset.rules.chapter2.comments.HeaderCommentRule.Companion.afterCopyrightRegex
+import org.cqfn.diktat.ruleset.rules.chapter2.comments.HeaderCommentRule.Companion.curYear
+import org.cqfn.diktat.ruleset.rules.chapter2.comments.HeaderCommentRule.Companion.hyphenRegex
 
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.KModifier

diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/DiktatRuleSetProvider.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/DiktatRuleSetProvider.kt
@@ -4,26 +4,68 @@ import org.cqfn.diktat.common.config.rules.DIKTAT_COMMON
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.common.config.rules.RulesConfigReader
 import org.cqfn.diktat.ruleset.constants.Warnings
-import org.cqfn.diktat.ruleset.rules.calculations.AccurateCalculationsRule
-import org.cqfn.diktat.ruleset.rules.classes.AbstractClassesRule
-import org.cqfn.diktat.ruleset.rules.classes.CompactInitialization
-import org.cqfn.diktat.ruleset.rules.classes.DataClassesRule
-import org.cqfn.diktat.ruleset.rules.classes.SingleConstructorRule
-import org.cqfn.diktat.ruleset.rules.classes.SingleInitRule
-import org.cqfn.diktat.ruleset.rules.classes.StatelessClassesRule
-import org.cqfn.diktat.ruleset.rules.comments.CommentsRule
-import org.cqfn.diktat.ruleset.rules.comments.HeaderCommentRule
-import org.cqfn.diktat.ruleset.rules.files.BlankLinesRule
-import org.cqfn.diktat.ruleset.rules.files.FileSize
-import org.cqfn.diktat.ruleset.rules.files.FileStructureRule
-import org.cqfn.diktat.ruleset.rules.files.IndentationRule
-import org.cqfn.diktat.ruleset.rules.files.NewlinesRule
-import org.cqfn.diktat.ruleset.rules.files.WhiteSpaceRule
-import org.cqfn.diktat.ruleset.rules.identifiers.LocalVariablesRule
-import org.cqfn.diktat.ruleset.rules.kdoc.CommentsFormatting
-import org.cqfn.diktat.ruleset.rules.kdoc.KdocComments
-import org.cqfn.diktat.ruleset.rules.kdoc.KdocFormatting
-import org.cqfn.diktat.ruleset.rules.kdoc.KdocMethods
+import org.cqfn.diktat.ruleset.rules.chapter1.FileNaming
+import org.cqfn.diktat.ruleset.rules.chapter1.IdentifierNaming
+import org.cqfn.diktat.ruleset.rules.chapter1.PackageNaming
+import org.cqfn.diktat.ruleset.rules.chapter3.AnnotationNewLineRule
+import org.cqfn.diktat.ruleset.rules.chapter3.BlockStructureBraces
+import org.cqfn.diktat.ruleset.rules.chapter3.BracesInConditionalsAndLoopsRule
+import org.cqfn.diktat.ruleset.rules.chapter3.ClassLikeStructuresOrderRule
+import org.cqfn.diktat.ruleset.rules.chapter3.ConsecutiveSpacesRule
+import org.cqfn.diktat.ruleset.rules.chapter3.EmptyBlock
+import org.cqfn.diktat.ruleset.rules.chapter3.EnumsSeparated
+import org.cqfn.diktat.ruleset.rules.chapter3.LineLength
+import org.cqfn.diktat.ruleset.rules.chapter3.LongNumericalValuesSeparatedRule
+import org.cqfn.diktat.ruleset.rules.chapter3.MultipleModifiersSequence
+import org.cqfn.diktat.ruleset.rules.chapter3.NullableTypeRule
+import org.cqfn.diktat.ruleset.rules.chapter3.SingleLineStatementsRule
+import org.cqfn.diktat.ruleset.rules.chapter3.SortRule
+import org.cqfn.diktat.ruleset.rules.chapter3.StringConcatenationRule
+import org.cqfn.diktat.ruleset.rules.chapter3.StringTemplateFormatRule
+import org.cqfn.diktat.ruleset.rules.chapter3.WhenMustHaveElseRule
+import org.cqfn.diktat.ruleset.rules.chapter4.ImmutableValNoVarRule
+import org.cqfn.diktat.ruleset.rules.chapter4.NullChecksRule
+import org.cqfn.diktat.ruleset.rules.chapter4.SmartCastRule
+import org.cqfn.diktat.ruleset.rules.chapter4.TypeAliasRule
+import org.cqfn.diktat.ruleset.rules.chapter4.VariableGenericTypeDeclarationRule
+import org.cqfn.diktat.ruleset.rules.chapter5.AsyncAndSyncRule
+import org.cqfn.diktat.ruleset.rules.chapter5.AvoidNestedFunctionsRule
+import org.cqfn.diktat.ruleset.rules.chapter5.CheckInverseMethodRule
+import org.cqfn.diktat.ruleset.rules.chapter5.CustomLabel
+import org.cqfn.diktat.ruleset.rules.chapter5.FunctionArgumentsSize
+import org.cqfn.diktat.ruleset.rules.chapter5.FunctionLength
+import org.cqfn.diktat.ruleset.rules.chapter5.LambdaLengthRule
+import org.cqfn.diktat.ruleset.rules.chapter5.LambdaParameterOrder
+import org.cqfn.diktat.ruleset.rules.chapter5.NestedFunctionBlock
+import org.cqfn.diktat.ruleset.rules.chapter5.OverloadingArgumentsFunction
+import org.cqfn.diktat.ruleset.rules.chapter6.AvoidEmptyPrimaryConstructor
+import org.cqfn.diktat.ruleset.rules.chapter6.AvoidUtilityClass
+import org.cqfn.diktat.ruleset.rules.chapter6.CustomGetterSetterRule
+import org.cqfn.diktat.ruleset.rules.chapter6.ExtensionFunctionsSameNameRule
+import org.cqfn.diktat.ruleset.rules.chapter6.ImplicitBackingPropertyRule
+import org.cqfn.diktat.ruleset.rules.chapter6.PropertyAccessorFields
+import org.cqfn.diktat.ruleset.rules.chapter6.TrivialPropertyAccessors
+import org.cqfn.diktat.ruleset.rules.chapter6.UselessSupertype
+import org.cqfn.diktat.ruleset.rules.chapter4.calculations.AccurateCalculationsRule
+import org.cqfn.diktat.ruleset.rules.chapter6.classes.AbstractClassesRule
+import org.cqfn.diktat.ruleset.rules.chapter6.classes.CompactInitialization
+import org.cqfn.diktat.ruleset.rules.chapter6.classes.DataClassesRule
+import org.cqfn.diktat.ruleset.rules.chapter6.classes.SingleConstructorRule
+import org.cqfn.diktat.ruleset.rules.chapter6.classes.SingleInitRule
+import org.cqfn.diktat.ruleset.rules.chapter6.classes.StatelessClassesRule
+import org.cqfn.diktat.ruleset.rules.chapter2.comments.CommentsRule
+import org.cqfn.diktat.ruleset.rules.chapter2.comments.HeaderCommentRule
+import org.cqfn.diktat.ruleset.rules.chapter3.files.BlankLinesRule
+import org.cqfn.diktat.ruleset.rules.chapter3.files.FileSize
+import org.cqfn.diktat.ruleset.rules.chapter3.files.FileStructureRule
+import org.cqfn.diktat.ruleset.rules.chapter3.files.IndentationRule
+import org.cqfn.diktat.ruleset.rules.chapter3.files.NewlinesRule
+import org.cqfn.diktat.ruleset.rules.chapter3.files.WhiteSpaceRule
+import org.cqfn.diktat.ruleset.rules.chapter3.identifiers.LocalVariablesRule
+import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.CommentsFormatting
+import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.KdocComments
+import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.KdocFormatting
+import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.KdocMethods
 
 import com.pinterest.ktlint.core.RuleSet
 import com.pinterest.ktlint.core.RuleSetProvider

diff --git a/...g/cqfn/diktat/ruleset/rules/FileNaming.kt → ...ktat/ruleset/rules/chapter1/FileNaming.kt b/...g/cqfn/diktat/ruleset/rules/FileNaming.kt → ...ktat/ruleset/rules/chapter1/FileNaming.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter1
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/.../diktat/ruleset/rules/IdentifierNaming.kt → ...uleset/rules/chapter1/IdentifierNaming.kt b/.../diktat/ruleset/rules/IdentifierNaming.kt → ...uleset/rules/chapter1/IdentifierNaming.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter1
 
 import org.cqfn.diktat.common.config.rules.RuleConfiguration
 import org.cqfn.diktat.common.config.rules.RulesConfig

diff --git a/...qfn/diktat/ruleset/rules/PackageNaming.kt → ...t/ruleset/rules/chapter1/PackageNaming.kt b/...qfn/diktat/ruleset/rules/PackageNaming.kt → ...t/ruleset/rules/chapter1/PackageNaming.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter1
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.common.config.rules.getCommonConfiguration

diff --git a/...at/ruleset/rules/comments/CommentsRule.kt → ...t/rules/chapter2/comments/CommentsRule.kt b/...at/ruleset/rules/comments/CommentsRule.kt → ...t/rules/chapter2/comments/CommentsRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules.comments
+package org.cqfn.diktat.ruleset.rules.chapter2.comments
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/...leset/rules/comments/HeaderCommentRule.kt → ...es/chapter2/comments/HeaderCommentRule.kt b/...leset/rules/comments/HeaderCommentRule.kt → ...es/chapter2/comments/HeaderCommentRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules.comments
+package org.cqfn.diktat.ruleset.rules.chapter2.comments
 
 import org.cqfn.diktat.common.config.rules.RuleConfiguration
 import org.cqfn.diktat.common.config.rules.RulesConfig

diff --git a/.../ruleset/rules/kdoc/CommentsFormatting.kt → ...rules/chapter2/kdoc/CommentsFormatting.kt b/.../ruleset/rules/kdoc/CommentsFormatting.kt → ...rules/chapter2/kdoc/CommentsFormatting.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules.kdoc
+package org.cqfn.diktat.ruleset.rules.chapter2.kdoc
 
 import org.cqfn.diktat.common.config.rules.RuleConfiguration
 import org.cqfn.diktat.common.config.rules.RulesConfig

diff --git a/...diktat/ruleset/rules/kdoc/KdocComments.kt → ...leset/rules/chapter2/kdoc/KdocComments.kt b/...diktat/ruleset/rules/kdoc/KdocComments.kt → ...leset/rules/chapter2/kdoc/KdocComments.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules.kdoc
+package org.cqfn.diktat.ruleset.rules.chapter2.kdoc
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.common.config.rules.getCommonConfiguration

diff --git a/...ktat/ruleset/rules/kdoc/KdocFormatting.kt → ...set/rules/chapter2/kdoc/KdocFormatting.kt b/...ktat/ruleset/rules/kdoc/KdocFormatting.kt → ...set/rules/chapter2/kdoc/KdocFormatting.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules.kdoc
+package org.cqfn.diktat.ruleset.rules.chapter2.kdoc
 
 import org.cqfn.diktat.common.config.rules.RuleConfiguration
 import org.cqfn.diktat.common.config.rules.RulesConfig

diff --git a/.../diktat/ruleset/rules/kdoc/KdocMethods.kt → ...uleset/rules/chapter2/kdoc/KdocMethods.kt b/.../diktat/ruleset/rules/kdoc/KdocMethods.kt → ...uleset/rules/chapter2/kdoc/KdocMethods.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules.kdoc
+package org.cqfn.diktat.ruleset.rules.chapter2.kdoc
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.common.config.rules.getCommonConfiguration

diff --git a/...at/ruleset/rules/AnnotationNewLineRule.kt → ...t/rules/chapter3/AnnotationNewLineRule.kt b/...at/ruleset/rules/AnnotationNewLineRule.kt → ...t/rules/chapter3/AnnotationNewLineRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/...tat/ruleset/rules/BlockStructureBraces.kt → ...et/rules/chapter3/BlockStructureBraces.kt b/...tat/ruleset/rules/BlockStructureBraces.kt → ...et/rules/chapter3/BlockStructureBraces.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RuleConfiguration
 import org.cqfn.diktat.common.config.rules.RulesConfig
@@ -20,7 +20,6 @@ import com.pinterest.ktlint.core.ast.ElementType.ELSE
 import com.pinterest.ktlint.core.ast.ElementType.ELSE_KEYWORD
 import com.pinterest.ktlint.core.ast.ElementType.FINALLY
 import com.pinterest.ktlint.core.ast.ElementType.FINALLY_KEYWORD
-import com.pinterest.ktlint.core.ast.ElementType.FOR
 import com.pinterest.ktlint.core.ast.ElementType.FUN
 import com.pinterest.ktlint.core.ast.ElementType.FUNCTION_LITERAL
 import com.pinterest.ktlint.core.ast.ElementType.IF
@@ -31,7 +30,6 @@ import com.pinterest.ktlint.core.ast.ElementType.SECONDARY_CONSTRUCTOR
 import com.pinterest.ktlint.core.ast.ElementType.THEN
 import com.pinterest.ktlint.core.ast.ElementType.TRY
 import com.pinterest.ktlint.core.ast.ElementType.WHEN
-import com.pinterest.ktlint.core.ast.ElementType.WHILE
 import com.pinterest.ktlint.core.ast.ElementType.WHILE_KEYWORD
 import com.pinterest.ktlint.core.ast.ElementType.WHITE_SPACE
 import com.pinterest.ktlint.core.ast.isWhiteSpaceWithNewline

diff --git a/...rules/BracesInConditionalsAndLoopsRule.kt → ...pter3/BracesInConditionalsAndLoopsRule.kt b/...rules/BracesInConditionalsAndLoopsRule.kt → ...pter3/BracesInConditionalsAndLoopsRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/...set/rules/ClassLikeStructuresOrderRule.kt → .../chapter3/ClassLikeStructuresOrderRule.kt b/...set/rules/ClassLikeStructuresOrderRule.kt → .../chapter3/ClassLikeStructuresOrderRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/...at/ruleset/rules/ConsecutiveSpacesRule.kt → ...t/rules/chapter3/ConsecutiveSpacesRule.kt b/...at/ruleset/rules/ConsecutiveSpacesRule.kt → ...t/rules/chapter3/ConsecutiveSpacesRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RuleConfiguration
 import org.cqfn.diktat.common.config.rules.RulesConfig

diff --git a/...g/cqfn/diktat/ruleset/rules/EmptyBlock.kt → ...ktat/ruleset/rules/chapter3/EmptyBlock.kt b/...g/cqfn/diktat/ruleset/rules/EmptyBlock.kt → ...ktat/ruleset/rules/chapter3/EmptyBlock.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RuleConfiguration
 import org.cqfn.diktat.common.config.rules.RulesConfig

diff --git a/...fn/diktat/ruleset/rules/EnumsSeparated.kt → .../ruleset/rules/chapter3/EnumsSeparated.kt b/...fn/diktat/ruleset/rules/EnumsSeparated.kt → .../ruleset/rules/chapter3/EnumsSeparated.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/...g/cqfn/diktat/ruleset/rules/LineLength.kt → ...ktat/ruleset/rules/chapter3/LineLength.kt b/...g/cqfn/diktat/ruleset/rules/LineLength.kt → ...ktat/ruleset/rules/chapter3/LineLength.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RuleConfiguration
 import org.cqfn.diktat.common.config.rules.RulesConfig

diff --git a/...rules/LongNumericalValuesSeparatedRule.kt → ...pter3/LongNumericalValuesSeparatedRule.kt b/...rules/LongNumericalValuesSeparatedRule.kt → ...pter3/LongNumericalValuesSeparatedRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RuleConfiguration
 import org.cqfn.diktat.common.config.rules.RulesConfig
@@ -63,10 +63,10 @@ class LongNumericalValuesSeparatedRule(private val configRules: List<RulesConfig
     }
 
     private fun fixFloatConstantPart(
-        realPart: String,
-        fractionalPart: String,
-        configuration: LongNumericalValuesConfiguration,
-        node: ASTNode) {
+            realPart: String,
+            fractionalPart: String,
+            configuration: LongNumericalValuesConfiguration,
+            node: ASTNode) {
         val resultRealPart = StringBuilder(nodePrefix(realPart))
         val resultFractionalPart = StringBuilder()
 
@@ -109,9 +109,9 @@ class LongNumericalValuesSeparatedRule(private val configRules: List<RulesConfig
     }
 
     private fun isValidConstant(
-        text: String,
-        configuration: LongNumericalValuesConfiguration,
-        node: ASTNode): Boolean {
+            text: String,
+            configuration: LongNumericalValuesConfiguration,
+            node: ASTNode): Boolean {
         if (text.contains("_")) {
             checkBlocks(removePrefixSuffix(text), configuration, node)
             return true
@@ -124,9 +124,9 @@ class LongNumericalValuesSeparatedRule(private val configRules: List<RulesConfig
     }
 
     private fun checkBlocks(
-        text: String,
-        configuration: LongNumericalValuesConfiguration,
-        node: ASTNode) {
+            text: String,
+            configuration: LongNumericalValuesConfiguration,
+            node: ASTNode) {
         val blocks = text.split("_", ".")
 
         blocks.forEach {

diff --git a/...uleset/rules/MultipleModifiersSequence.kt → ...les/chapter3/MultipleModifiersSequence.kt b/...uleset/rules/MultipleModifiersSequence.kt → ...les/chapter3/MultipleModifiersSequence.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/.../diktat/ruleset/rules/NullableTypeRule.kt → ...uleset/rules/chapter3/NullableTypeRule.kt b/.../diktat/ruleset/rules/NullableTypeRule.kt → ...uleset/rules/chapter3/NullableTypeRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/...ruleset/rules/SingleLineStatementsRule.kt → ...ules/chapter3/SingleLineStatementsRule.kt b/...ruleset/rules/SingleLineStatementsRule.kt → ...ules/chapter3/SingleLineStatementsRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/...org/cqfn/diktat/ruleset/rules/SortRule.kt → ...diktat/ruleset/rules/chapter3/SortRule.kt b/...org/cqfn/diktat/ruleset/rules/SortRule.kt → ...diktat/ruleset/rules/chapter3/SortRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RuleConfiguration
 import org.cqfn.diktat.common.config.rules.RulesConfig

diff --git a/.../ruleset/rules/StringConcatenationRule.kt → ...rules/chapter3/StringConcatenationRule.kt b/.../ruleset/rules/StringConcatenationRule.kt → ...rules/chapter3/StringConcatenationRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/...ruleset/rules/StringTemplateFormatRule.kt → ...ules/chapter3/StringTemplateFormatRule.kt b/...ruleset/rules/StringTemplateFormatRule.kt → ...ules/chapter3/StringTemplateFormatRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType
@@ -7,14 +7,8 @@ import org.cqfn.diktat.ruleset.utils.findAllNodesWithSpecificType
 import org.cqfn.diktat.ruleset.utils.hasAnyChildOfTypes
 
 import com.pinterest.ktlint.core.Rule
-import com.pinterest.ktlint.core.ast.ElementType
 import com.pinterest.ktlint.core.ast.ElementType.ARRAY_ACCESS_EXPRESSION
-import com.pinterest.ktlint.core.ast.ElementType.BINARY_EXPRESSION
-import com.pinterest.ktlint.core.ast.ElementType.BINARY_WITH_TYPE
-import com.pinterest.ktlint.core.ast.ElementType.CALL_EXPRESSION
 import com.pinterest.ktlint.core.ast.ElementType.CLOSING_QUOTE
-import com.pinterest.ktlint.core.ast.ElementType.COLONCOLON
-import com.pinterest.ktlint.core.ast.ElementType.DOT_QUALIFIED_EXPRESSION
 import com.pinterest.ktlint.core.ast.ElementType.FLOAT_CONSTANT
 import com.pinterest.ktlint.core.ast.ElementType.IDENTIFIER
 import com.pinterest.ktlint.core.ast.ElementType.INTEGER_CONSTANT

diff --git a/...tat/ruleset/rules/WhenMustHaveElseRule.kt → ...et/rules/chapter3/WhenMustHaveElseRule.kt b/...tat/ruleset/rules/WhenMustHaveElseRule.kt → ...et/rules/chapter3/WhenMustHaveElseRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter3
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/...tat/ruleset/rules/files/BlankLinesRule.kt → ...et/rules/chapter3/files/BlankLinesRule.kt b/...tat/ruleset/rules/files/BlankLinesRule.kt → ...et/rules/chapter3/files/BlankLinesRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules.files
+package org.cqfn.diktat.ruleset.rules.chapter3.files
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/...fn/diktat/ruleset/rules/files/FileSize.kt → .../ruleset/rules/chapter3/files/FileSize.kt b/...fn/diktat/ruleset/rules/files/FileSize.kt → .../ruleset/rules/chapter3/files/FileSize.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules.files
+package org.cqfn.diktat.ruleset.rules.chapter3.files
 
 import org.cqfn.diktat.common.config.rules.RuleConfiguration
 import org.cqfn.diktat.common.config.rules.RulesConfig

diff --git a/.../ruleset/rules/files/FileStructureRule.kt → ...rules/chapter3/files/FileStructureRule.kt b/.../ruleset/rules/files/FileStructureRule.kt → ...rules/chapter3/files/FileStructureRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules.files
+package org.cqfn.diktat.ruleset.rules.chapter3.files
 
 import org.cqfn.diktat.common.config.rules.RuleConfiguration
 import org.cqfn.diktat.common.config.rules.RulesConfig
@@ -10,7 +10,7 @@ import org.cqfn.diktat.ruleset.constants.Warnings.FILE_INCORRECT_BLOCKS_ORDER
 import org.cqfn.diktat.ruleset.constants.Warnings.FILE_NO_BLANK_LINE_BETWEEN_BLOCKS
 import org.cqfn.diktat.ruleset.constants.Warnings.FILE_UNORDERED_IMPORTS
 import org.cqfn.diktat.ruleset.constants.Warnings.FILE_WILDCARD_IMPORTS
-import org.cqfn.diktat.ruleset.rules.PackageNaming.Companion.PACKAGE_SEPARATOR
+import org.cqfn.diktat.ruleset.rules.chapter1.PackageNaming.Companion.PACKAGE_SEPARATOR
 import org.cqfn.diktat.ruleset.utils.StandardPlatforms
 import org.cqfn.diktat.ruleset.utils.copyrightWords
 import org.cqfn.diktat.ruleset.utils.handleIncorrectOrder
@@ -174,9 +174,9 @@ class FileStructureRule(private val configRules: List<RulesConfig>) : Rule("file
 
     @Suppress("UnsafeCallOnNullableType")
     private fun checkImportsOrder(
-        node: ASTNode,
-        wildCardImportsConfig: WildCardImportsConfig,
-        importsGroupingConfig: ImportsGroupingConfig
+            node: ASTNode,
+            wildCardImportsConfig: WildCardImportsConfig,
+            importsGroupingConfig: ImportsGroupingConfig
     ) {
         val imports = node.getChildren(TokenSet.create(IMPORT_DIRECTIVE)).toList()
 

diff --git a/...at/ruleset/rules/files/IndentationRule.kt → ...t/rules/chapter3/files/IndentationRule.kt b/...at/ruleset/rules/files/IndentationRule.kt → ...t/rules/chapter3/files/IndentationRule.kt
@@ -2,7 +2,7 @@
  * Main logic of indentation including Rule and utility classes and methods.
  */
 
-package org.cqfn.diktat.ruleset.rules.files
+package org.cqfn.diktat.ruleset.rules.chapter3.files
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.common.config.rules.getRuleConfig

diff --git a/...iktat/ruleset/rules/files/NewlinesRule.kt → ...eset/rules/chapter3/files/NewlinesRule.kt b/...iktat/ruleset/rules/files/NewlinesRule.kt → ...eset/rules/chapter3/files/NewlinesRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules.files
+package org.cqfn.diktat.ruleset.rules.chapter3.files
 
 import org.cqfn.diktat.common.config.rules.RuleConfiguration
 import org.cqfn.diktat.common.config.rules.RulesConfig

diff --git a/...tat/ruleset/rules/files/WhiteSpaceRule.kt → ...et/rules/chapter3/files/WhiteSpaceRule.kt b/...tat/ruleset/rules/files/WhiteSpaceRule.kt → ...et/rules/chapter3/files/WhiteSpaceRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules.files
+package org.cqfn.diktat.ruleset.rules.chapter3.files
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/...t/rules/identifiers/LocalVariablesRule.kt → ...hapter3/identifiers/LocalVariablesRule.kt b/...t/rules/identifiers/LocalVariablesRule.kt → ...hapter3/identifiers/LocalVariablesRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules.identifiers
+package org.cqfn.diktat.ruleset.rules.chapter3.identifiers
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType

diff --git a/...at/ruleset/rules/ImmutableValNoVarRule.kt → ...t/rules/chapter4/ImmutableValNoVarRule.kt b/...at/ruleset/rules/ImmutableValNoVarRule.kt → ...t/rules/chapter4/ImmutableValNoVarRule.kt
@@ -1,4 +1,4 @@
-package org.cqfn.diktat.ruleset.rules
+package org.cqfn.diktat.ruleset.rules.chapter4
 
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.EmitType