From ff27cad4a0a04ecbf5152433b3c8a3d37da6bade Mon Sep 17 00:00:00 2001 From: aktsay6 Date: Tue, 26 Jan 2021 14:52:38 +0300 Subject: [PATCH] bugfix/rules-to-chapter-folders(#719) ### What's done: * Rules are now split to chapters --- .../diktat/ruleset/generation/Generation.kt | 6 +- .../ruleset/rules/DiktatRuleSetProvider.kt | 82 ++++++++++++++----- .../rules/{ => chapter1}/FileNaming.kt | 2 +- .../rules/{ => chapter1}/IdentifierNaming.kt | 2 +- .../rules/{ => chapter1}/PackageNaming.kt | 2 +- .../{ => chapter2}/comments/CommentsRule.kt | 2 +- .../comments/HeaderCommentRule.kt | 2 +- .../{ => chapter2}/kdoc/CommentsFormatting.kt | 2 +- .../rules/{ => chapter2}/kdoc/KdocComments.kt | 2 +- .../{ => chapter2}/kdoc/KdocFormatting.kt | 2 +- .../rules/{ => chapter2}/kdoc/KdocMethods.kt | 2 +- .../{ => chapter3}/AnnotationNewLineRule.kt | 2 +- .../{ => chapter3}/BlockStructureBraces.kt | 4 +- .../BracesInConditionalsAndLoopsRule.kt | 2 +- .../ClassLikeStructuresOrderRule.kt | 2 +- .../{ => chapter3}/ConsecutiveSpacesRule.kt | 2 +- .../rules/{ => chapter3}/EmptyBlock.kt | 2 +- .../rules/{ => chapter3}/EnumsSeparated.kt | 2 +- .../rules/{ => chapter3}/LineLength.kt | 2 +- .../LongNumericalValuesSeparatedRule.kt | 22 ++--- .../MultipleModifiersSequence.kt | 2 +- .../rules/{ => chapter3}/NullableTypeRule.kt | 2 +- .../SingleLineStatementsRule.kt | 2 +- .../ruleset/rules/{ => chapter3}/SortRule.kt | 2 +- .../{ => chapter3}/StringConcatenationRule.kt | 2 +- .../StringTemplateFormatRule.kt | 8 +- .../{ => chapter3}/WhenMustHaveElseRule.kt | 2 +- .../{ => chapter3}/files/BlankLinesRule.kt | 2 +- .../rules/{ => chapter3}/files/FileSize.kt | 2 +- .../{ => chapter3}/files/FileStructureRule.kt | 10 +-- .../{ => chapter3}/files/IndentationRule.kt | 2 +- .../{ => chapter3}/files/NewlinesRule.kt | 2 +- .../{ => chapter3}/files/WhiteSpaceRule.kt | 2 +- .../identifiers/LocalVariablesRule.kt | 2 +- .../{ => chapter4}/ImmutableValNoVarRule.kt | 2 +- .../rules/{ => chapter4}/NullChecksRule.kt | 2 +- .../rules/{ => chapter4}/SmartCastRule.kt | 5 +- .../rules/{ => chapter4}/TypeAliasRule.kt | 5 +- .../VariableGenericTypeDeclarationRule.kt | 2 +- .../calculations/AccurateCalculationsRule.kt | 2 +- .../rules/{ => chapter5}/AsyncAndSyncRule.kt | 2 +- .../AvoidNestedFunctionsRule.kt | 2 +- .../{ => chapter5}/CheckInverseMethodRule.kt | 2 +- .../rules/{ => chapter5}/CustomLabel.kt | 2 +- .../{ => chapter5}/FunctionArgumentsSize.kt | 2 +- .../rules/{ => chapter5}/FunctionLength.kt | 2 +- .../rules/{ => chapter5}/LambdaLengthRule.kt | 2 +- .../{ => chapter5}/LambdaParameterOrder.kt | 2 +- .../{ => chapter5}/NestedFunctionBlock.kt | 2 +- .../OverloadingArgumentsFunction.kt | 2 +- .../AvoidEmptyPrimaryConstructor.kt | 2 +- .../rules/{ => chapter6}/AvoidUtilityClass.kt | 2 +- .../{ => chapter6}/CustomGetterSetterRule.kt | 2 +- .../ExtensionFunctionsSameNameRule.kt | 2 +- .../ImplicitBackingPropertyRule.kt | 2 +- .../{ => chapter6}/PropertyAccessorFields.kt | 2 +- .../TrivialPropertyAccessors.kt | 2 +- .../rules/{ => chapter6}/UselessSupertype.kt | 2 +- .../classes/AbstractClassesRule.kt | 2 +- .../classes/CompactInitialization.kt | 2 +- .../{ => chapter6}/classes/DataClassesRule.kt | 2 +- .../classes/SingleConstructorRule.kt | 2 +- .../{ => chapter6}/classes/SingleInitRule.kt | 2 +- .../classes/StatelessClassesRule.kt | 2 +- .../cqfn/diktat/ruleset/utils/AstNodeUtils.kt | 2 +- .../ruleset/utils/indentation/Checkers.kt | 4 +- .../indentation/CustomIndentationChecker.kt | 2 +- .../utils/indentation/IndentationConfig.kt | 2 +- .../ruleset/chapter1/EnumValueCaseTest.kt | 2 +- .../chapter1/IdentifierNamingFixTest.kt | 2 +- .../chapter1/IdentifierNamingWarnTest.kt | 2 +- .../ruleset/chapter1/MethodNamingWarnTest.kt | 2 +- .../ruleset/chapter1/PackageNamingFixTest.kt | 3 +- .../ruleset/chapter1/PackageNamingWarnTest.kt | 2 +- .../ruleset/chapter1/PackagePathFixTest.kt | 3 +- .../chapter2/CommentsFormattingFixTest.kt | 2 +- .../chapter2/CommentsFormattingTest.kt | 2 +- .../chapter2/HeaderCommentRuleFixTest.kt | 2 +- .../ruleset/chapter2/HeaderCommentRuleTest.kt | 2 +- .../ruleset/chapter2/KdocCommentsFixTest.kt | 2 +- .../ruleset/chapter2/KdocCommentsWarnTest.kt | 2 +- .../ruleset/chapter2/KdocFormattingFixTest.kt | 2 +- .../ruleset/chapter2/KdocFormattingTest.kt | 2 +- .../ruleset/chapter2/KdocMethodsFixTest.kt | 2 +- .../ruleset/chapter2/KdocMethodsTest.kt | 2 +- .../chapter2/KdocParamPresentWarnTest.kt | 2 +- .../chapter2/comments/CommentedCodeTest.kt | 2 +- .../chapter3/AnnotationNewLineRuleFixTest.kt | 2 +- .../chapter3/AnnotationNewLineRuleWarnTest.kt | 2 +- .../chapter3/BlockStructureBracesFixTest.kt | 2 +- .../chapter3/BlockStructureBracesWarnTest.kt | 2 +- .../ruleset/chapter3/BracesRuleFixTest.kt | 2 +- .../ruleset/chapter3/BracesRuleWarnTest.kt | 2 +- .../ClassLikeStructuresOrderFixTest.kt | 2 +- .../ClassLikeStructuresOrderRuleWarnTest.kt | 2 +- .../chapter3/ConsecutiveSpacesRuleFixTest.kt | 2 +- .../chapter3/ConsecutiveSpacesRuleWarnTest.kt | 2 +- .../ruleset/chapter3/EmptyBlockFixTest.kt | 2 +- .../ruleset/chapter3/EmptyBlockWarnTest.kt | 2 +- .../ruleset/chapter3/EnumsSeparatedFixTest.kt | 2 +- .../chapter3/EnumsSeparatedWarnTest.kt | 2 +- .../ruleset/chapter3/FileSizeWarnTest.kt | 2 +- .../chapter3/FileStructureRuleFixTest.kt | 2 +- .../ruleset/chapter3/FileStructureRuleTest.kt | 2 +- .../ruleset/chapter3/LineLengthFixTest.kt | 2 +- .../ruleset/chapter3/LineLengthWarnTest.kt | 14 ++-- .../chapter3/LocalVariablesWarnTest.kt | 2 +- .../LongNumericalValuesSeparatedFixTest.kt | 2 +- .../LongNumericalValuesSeparatedWarnTest.kt | 2 +- .../MultipleModifiersSequenceFixTest.kt | 2 +- .../MultipleModifiersSequenceWarnTest.kt | 2 +- .../chapter3/NullableTypeRuleFixTest.kt | 2 +- .../chapter3/NullableTypeRuleWarnTest.kt | 2 +- .../SingleLineStatementsRuleFixTest.kt | 2 +- .../SingleLineStatementsRuleWarnTest.kt | 2 +- .../ruleset/chapter3/SortRuleFixTest.kt | 2 +- .../ruleset/chapter3/SortRuleWarnTest.kt | 2 +- .../chapter3/StringConcatenationWarnTest.kt | 2 +- .../chapter3/StringTemplateRuleFixTest.kt | 2 +- .../chapter3/StringTemplateRuleWarnTest.kt | 2 +- .../chapter3/WhenMustHaveElseFixTest.kt | 2 +- .../chapter3/WhenMustHaveElseWarnTest.kt | 2 +- .../chapter3/files/BlankLinesFixTest.kt | 2 +- .../chapter3/files/BlankLinesWarnTest.kt | 2 +- .../chapter3/files/NewlinesRuleFixTest.kt | 2 +- .../chapter3/files/NewlinesRuleWarnTest.kt | 2 +- .../chapter3/spaces/IndentationRuleFixTest.kt | 2 +- .../spaces/IndentationRuleWarnTest.kt | 2 +- .../chapter3/spaces/WhiteSpaceRuleFixTest.kt | 2 +- .../chapter3/spaces/WhiteSpaceRuleWarnTest.kt | 2 +- .../chapter4/AccurateCalculationsWarnTest.kt | 2 +- .../ruleset/chapter4/NoVarRuleWarnTest.kt | 2 +- .../ruleset/chapter4/NullChecksRuleFixTest.kt | 2 +- .../chapter4/NullChecksRuleWarnTest.kt | 2 +- .../ruleset/chapter4/SmartCastRuleFixTest.kt | 2 +- .../ruleset/chapter4/SmartCastRuleWarnTest.kt | 2 +- .../ruleset/chapter4/TypeAliasRuleWarnTest.kt | 2 +- ...riableGenericTypeDeclarationRuleFixTest.kt | 2 +- ...iableGenericTypeDeclarationRuleWarnTest.kt | 2 +- .../ruleset/chapter5/AsyncAndSyncRuleTest.kt | 2 +- .../chapter5/AvoidNestedFunctionsFixTest.kt | 2 +- .../chapter5/AvoidNestedFunctionsWarnTest.kt | 2 +- .../chapter5/CheckInverseMethodRuleFixTest.kt | 2 +- .../CheckInverseMethodRuleWarnTest.kt | 2 +- .../ruleset/chapter5/CustomLabelsTest.kt | 2 +- .../chapter5/FunctionArgumentsSizeWarnTest.kt | 2 +- .../chapter5/FunctionLengthWarnTest.kt | 2 +- .../ruleset/chapter5/LambdaLengthWarnTest.kt | 2 +- .../chapter5/LambdaParameterOrderWarnTest.kt | 2 +- .../chapter5/NestedFunctionBlockWarnTest.kt | 2 +- .../OverloadingArgumentsFunctionWarnTest.kt | 2 +- .../chapter6/AbstractClassesFixTest.kt | 2 +- .../chapter6/AbstractClassesWarnTest.kt | 2 +- .../chapter6/AvoidUtilityClassWarnTest.kt | 2 +- .../chapter6/CompactInitializationFixTest.kt | 2 +- .../chapter6/CompactInitializationWarnTest.kt | 2 +- .../chapter6/CustomGetterSetterWarnTest.kt | 2 +- .../chapter6/DataClassesRuleWarnTest.kt | 2 +- .../EmptyPrimaryConstructorFixTest.kt | 2 +- .../EmptyPrimaryConstructorWarnTest.kt | 2 +- .../ExtensionFunctionsSameNameWarnTest.kt | 2 +- .../ImplicitBackingPropertyWarnTest.kt | 2 +- .../PropertyAccessorFieldsWarnTest.kt | 2 +- .../chapter6/SingleConstructorRuleFixTest.kt | 2 +- .../chapter6/SingleConstructorRuleWarnTest.kt | 2 +- .../ruleset/chapter6/SingleInitRuleFixTest.kt | 2 +- .../chapter6/SingleInitRuleWarnTest.kt | 2 +- .../chapter6/StatelessClassesRuleFixTest.kt | 2 +- .../chapter6/StatelessClassesRuleWarnTest.kt | 2 +- .../TrivialPropertyAccessorsFixTest.kt | 2 +- .../TrivialPropertyAccessorsWarnTest.kt | 2 +- .../chapter6/UselessSupertypeFixTest.kt | 2 +- .../chapter6/UselessSupertypeWarnTest.kt | 2 +- .../cqfn/diktat/ruleset/utils/SuppressTest.kt | 2 +- 174 files changed, 258 insertions(+), 232 deletions(-) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter1}/FileNaming.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter1}/IdentifierNaming.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter1}/PackageNaming.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter2}/comments/CommentsRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter2}/comments/HeaderCommentRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter2}/kdoc/CommentsFormatting.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter2}/kdoc/KdocComments.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter2}/kdoc/KdocFormatting.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter2}/kdoc/KdocMethods.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/AnnotationNewLineRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/BlockStructureBraces.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/BracesInConditionalsAndLoopsRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/ClassLikeStructuresOrderRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/ConsecutiveSpacesRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/EmptyBlock.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/EnumsSeparated.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/LineLength.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/LongNumericalValuesSeparatedRule.kt (92%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/MultipleModifiersSequence.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/NullableTypeRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/SingleLineStatementsRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/SortRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/StringConcatenationRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/StringTemplateFormatRule.kt (92%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/WhenMustHaveElseRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/files/BlankLinesRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/files/FileSize.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/files/FileStructureRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/files/IndentationRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/files/NewlinesRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/files/WhiteSpaceRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter3}/identifiers/LocalVariablesRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter4}/ImmutableValNoVarRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter4}/NullChecksRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter4}/SmartCastRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter4}/TypeAliasRule.kt (92%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter4}/VariableGenericTypeDeclarationRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter4}/calculations/AccurateCalculationsRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter5}/AsyncAndSyncRule.kt (97%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter5}/AvoidNestedFunctionsRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter5}/CheckInverseMethodRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter5}/CustomLabel.kt (97%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter5}/FunctionArgumentsSize.kt (97%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter5}/FunctionLength.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter5}/LambdaLengthRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter5}/LambdaParameterOrder.kt (97%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter5}/NestedFunctionBlock.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter5}/OverloadingArgumentsFunction.kt (97%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/AvoidEmptyPrimaryConstructor.kt (96%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/AvoidUtilityClass.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/CustomGetterSetterRule.kt (97%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/ExtensionFunctionsSameNameRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/ImplicitBackingPropertyRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/PropertyAccessorFields.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/TrivialPropertyAccessors.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/UselessSupertype.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/classes/AbstractClassesRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/classes/CompactInitialization.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/classes/DataClassesRule.kt (98%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/classes/SingleConstructorRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/classes/SingleInitRule.kt (99%) rename diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/{ => chapter6}/classes/StatelessClassesRule.kt (98%) 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 index 946de2a73a..65a54a33e5 100644 --- 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 index 7860906895..a58e6898d8 100644 --- 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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/FileNaming.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter1/FileNaming.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/FileNaming.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter1/FileNaming.kt index b1a4d5a58a..16b71d2074 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/FileNaming.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/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-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/IdentifierNaming.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter1/IdentifierNaming.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/IdentifierNaming.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter1/IdentifierNaming.kt index 080cee41fa..974d5c8ab6 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/IdentifierNaming.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/PackageNaming.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter1/PackageNaming.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/PackageNaming.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter1/PackageNaming.kt index a21e6fdd27..1506e73958 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/PackageNaming.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/comments/CommentsRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/comments/CommentsRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/comments/CommentsRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/comments/CommentsRule.kt index 6cb7ea783b..f169fed02a 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/comments/CommentsRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/comments/HeaderCommentRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/comments/HeaderCommentRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/comments/HeaderCommentRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/comments/HeaderCommentRule.kt index 2f799d34a3..139131d308 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/comments/HeaderCommentRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/CommentsFormatting.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/kdoc/CommentsFormatting.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/CommentsFormatting.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/kdoc/CommentsFormatting.kt index a816a3c192..1bad4117e3 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/CommentsFormatting.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/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-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/KdocComments.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/kdoc/KdocComments.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/KdocComments.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/kdoc/KdocComments.kt index eedf6513b6..017ae3022c 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/KdocComments.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/KdocFormatting.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/kdoc/KdocFormatting.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/KdocFormatting.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/kdoc/KdocFormatting.kt index fefdfe34cc..c51d35729e 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/KdocFormatting.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/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-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/KdocMethods.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/kdoc/KdocMethods.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/KdocMethods.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter2/kdoc/KdocMethods.kt index 99f8f7b5e0..5ba0bed00c 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/KdocMethods.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AnnotationNewLineRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/AnnotationNewLineRule.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AnnotationNewLineRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/AnnotationNewLineRule.kt index eccc3ab41c..2d1e43229b 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AnnotationNewLineRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/BlockStructureBraces.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/BlockStructureBraces.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/BlockStructureBraces.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/BlockStructureBraces.kt index b1079ccf71..055d0b1cfb 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/BlockStructureBraces.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/BracesInConditionalsAndLoopsRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/BracesInConditionalsAndLoopsRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/BracesInConditionalsAndLoopsRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/BracesInConditionalsAndLoopsRule.kt index ccac24599b..bde41f027d 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/BracesInConditionalsAndLoopsRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ClassLikeStructuresOrderRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/ClassLikeStructuresOrderRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ClassLikeStructuresOrderRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/ClassLikeStructuresOrderRule.kt index cb55b7cc4e..a0e260122b 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ClassLikeStructuresOrderRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ConsecutiveSpacesRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/ConsecutiveSpacesRule.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ConsecutiveSpacesRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/ConsecutiveSpacesRule.kt index 25330bcdb8..43020086b9 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ConsecutiveSpacesRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/EmptyBlock.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/EmptyBlock.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/EmptyBlock.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/EmptyBlock.kt index d831d79d79..1b8ccfe088 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/EmptyBlock.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/EnumsSeparated.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/EnumsSeparated.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/EnumsSeparated.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/EnumsSeparated.kt index c57a5a651f..f3572561ca 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/EnumsSeparated.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/LineLength.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/LineLength.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/LineLength.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/LineLength.kt index e6ad7f6dbb..608abb0106 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/LineLength.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/LongNumericalValuesSeparatedRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/LongNumericalValuesSeparatedRule.kt similarity index 92% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/LongNumericalValuesSeparatedRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/LongNumericalValuesSeparatedRule.kt index 559ad014fc..ab97769512 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/LongNumericalValuesSeparatedRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/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) : 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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/IndentationRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/IndentationRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/IndentationRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/IndentationRule.kt index 135b3956ea..1af2aa40ec 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/IndentationRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/NewlinesRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/NewlinesRule.kt index 94cfb93e31..60d9d0a211 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/NewlinesRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/WhiteSpaceRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/WhiteSpaceRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/WhiteSpaceRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/files/WhiteSpaceRule.kt index 5a82accf5d..31961f2d9c 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/WhiteSpaceRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/identifiers/LocalVariablesRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/identifiers/LocalVariablesRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/identifiers/LocalVariablesRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/identifiers/LocalVariablesRule.kt index 9c4676ccf7..9d34d51248 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/identifiers/LocalVariablesRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter3/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/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ImmutableValNoVarRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/ImmutableValNoVarRule.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ImmutableValNoVarRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/ImmutableValNoVarRule.kt index 42100f2eaf..d55abfcca1 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ImmutableValNoVarRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/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 diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/NullChecksRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/NullChecksRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/NullChecksRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/NullChecksRule.kt index 57438aec78..79dff69830 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/NullChecksRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/NullChecksRule.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 diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/SmartCastRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/SmartCastRule.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/SmartCastRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/SmartCastRule.kt index 9e5b3c07c0..6d140c3929 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/SmartCastRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/SmartCastRule.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 @@ -15,7 +15,6 @@ import org.cqfn.diktat.ruleset.utils.search.findAllVariablesWithUsages import com.pinterest.ktlint.core.Rule import com.pinterest.ktlint.core.ast.ElementType.BINARY_WITH_TYPE import com.pinterest.ktlint.core.ast.ElementType.BLOCK -import com.pinterest.ktlint.core.ast.ElementType.CALL_EXPRESSION import com.pinterest.ktlint.core.ast.ElementType.DOT_QUALIFIED_EXPRESSION import com.pinterest.ktlint.core.ast.ElementType.ELSE import com.pinterest.ktlint.core.ast.ElementType.FILE @@ -35,8 +34,6 @@ import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.KtBlockExpression import org.jetbrains.kotlin.psi.KtNameReferenceExpression import org.jetbrains.kotlin.psi.KtProperty -import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier -import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier import org.jetbrains.kotlin.psi.psiUtil.isAncestor import org.jetbrains.kotlin.psi.psiUtil.parents diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/TypeAliasRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/TypeAliasRule.kt similarity index 92% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/TypeAliasRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/TypeAliasRule.kt index 2abc7e1709..c4aa2239ad 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/TypeAliasRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/TypeAliasRule.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.RuleConfiguration import org.cqfn.diktat.common.config.rules.RulesConfig @@ -8,10 +8,7 @@ import org.cqfn.diktat.ruleset.constants.Warnings.TYPE_ALIAS import org.cqfn.diktat.ruleset.utils.* import com.pinterest.ktlint.core.Rule -import com.pinterest.ktlint.core.ast.ElementType.FILE -import com.pinterest.ktlint.core.ast.ElementType.FUN import com.pinterest.ktlint.core.ast.ElementType.LT -import com.pinterest.ktlint.core.ast.ElementType.PROPERTY import com.pinterest.ktlint.core.ast.ElementType.SUPER_TYPE_LIST import com.pinterest.ktlint.core.ast.ElementType.TYPEALIAS import com.pinterest.ktlint.core.ast.ElementType.TYPE_REFERENCE diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/VariableGenericTypeDeclarationRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/VariableGenericTypeDeclarationRule.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/VariableGenericTypeDeclarationRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/VariableGenericTypeDeclarationRule.kt index f5541e1b71..55ca6458c6 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/VariableGenericTypeDeclarationRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/VariableGenericTypeDeclarationRule.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 diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/calculations/AccurateCalculationsRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/calculations/AccurateCalculationsRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/calculations/AccurateCalculationsRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/calculations/AccurateCalculationsRule.kt index 1241de61bd..5bff177c52 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/calculations/AccurateCalculationsRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter4/calculations/AccurateCalculationsRule.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules.calculations +package org.cqfn.diktat.ruleset.rules.chapter4.calculations import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AsyncAndSyncRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/AsyncAndSyncRule.kt similarity index 97% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AsyncAndSyncRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/AsyncAndSyncRule.kt index 10a9b81011..99b899dcf9 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AsyncAndSyncRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/AsyncAndSyncRule.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter5 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AvoidNestedFunctionsRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/AvoidNestedFunctionsRule.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AvoidNestedFunctionsRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/AvoidNestedFunctionsRule.kt index 4b4b5fff73..22cd128edd 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AvoidNestedFunctionsRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/AvoidNestedFunctionsRule.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter5 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/CheckInverseMethodRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/CheckInverseMethodRule.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/CheckInverseMethodRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/CheckInverseMethodRule.kt index a0c336ba91..ef009953fb 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/CheckInverseMethodRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/CheckInverseMethodRule.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter5 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/CustomLabel.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/CustomLabel.kt similarity index 97% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/CustomLabel.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/CustomLabel.kt index 37e458224d..175572475b 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/CustomLabel.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/CustomLabel.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter5 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/FunctionArgumentsSize.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/FunctionArgumentsSize.kt similarity index 97% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/FunctionArgumentsSize.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/FunctionArgumentsSize.kt index f808e27c7e..3d66bc5fea 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/FunctionArgumentsSize.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/FunctionArgumentsSize.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter5 import org.cqfn.diktat.common.config.rules.RuleConfiguration import org.cqfn.diktat.common.config.rules.RulesConfig diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/FunctionLength.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/FunctionLength.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/FunctionLength.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/FunctionLength.kt index a9c619fae2..907111ad8e 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/FunctionLength.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/FunctionLength.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter5 import org.cqfn.diktat.common.config.rules.RuleConfiguration import org.cqfn.diktat.common.config.rules.RulesConfig diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/LambdaLengthRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/LambdaLengthRule.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/LambdaLengthRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/LambdaLengthRule.kt index 9582baefe6..69f5d77969 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/LambdaLengthRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/LambdaLengthRule.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter5 import org.cqfn.diktat.common.config.rules.RuleConfiguration import org.cqfn.diktat.common.config.rules.RulesConfig diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/LambdaParameterOrder.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/LambdaParameterOrder.kt similarity index 97% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/LambdaParameterOrder.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/LambdaParameterOrder.kt index 52f31fa54d..486948f80a 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/LambdaParameterOrder.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/LambdaParameterOrder.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter5 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/NestedFunctionBlock.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/NestedFunctionBlock.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/NestedFunctionBlock.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/NestedFunctionBlock.kt index b441b56ff4..5fe828fb2a 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/NestedFunctionBlock.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/NestedFunctionBlock.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter5 import org.cqfn.diktat.common.config.rules.RuleConfiguration import org.cqfn.diktat.common.config.rules.RulesConfig diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/OverloadingArgumentsFunction.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/OverloadingArgumentsFunction.kt similarity index 97% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/OverloadingArgumentsFunction.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/OverloadingArgumentsFunction.kt index a91fd60d61..db03967186 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/OverloadingArgumentsFunction.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter5/OverloadingArgumentsFunction.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter5 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AvoidEmptyPrimaryConstructor.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/AvoidEmptyPrimaryConstructor.kt similarity index 96% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AvoidEmptyPrimaryConstructor.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/AvoidEmptyPrimaryConstructor.kt index 0702221cc8..7f26d48443 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AvoidEmptyPrimaryConstructor.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/AvoidEmptyPrimaryConstructor.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter6 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AvoidUtilityClass.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/AvoidUtilityClass.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AvoidUtilityClass.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/AvoidUtilityClass.kt index b99852b358..c2898168bb 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/AvoidUtilityClass.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/AvoidUtilityClass.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter6 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.common.config.rules.getCommonConfiguration diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/CustomGetterSetterRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/CustomGetterSetterRule.kt similarity index 97% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/CustomGetterSetterRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/CustomGetterSetterRule.kt index 209f6a3a99..a04266d072 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/CustomGetterSetterRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/CustomGetterSetterRule.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter6 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ExtensionFunctionsSameNameRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/ExtensionFunctionsSameNameRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ExtensionFunctionsSameNameRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/ExtensionFunctionsSameNameRule.kt index 3d6d6432be..59205894d0 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ExtensionFunctionsSameNameRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/ExtensionFunctionsSameNameRule.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter6 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ImplicitBackingPropertyRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/ImplicitBackingPropertyRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ImplicitBackingPropertyRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/ImplicitBackingPropertyRule.kt index 4337677b46..06ceee31fb 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/ImplicitBackingPropertyRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/ImplicitBackingPropertyRule.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter6 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/PropertyAccessorFields.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/PropertyAccessorFields.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/PropertyAccessorFields.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/PropertyAccessorFields.kt index 04ea4c009b..23ffd8fdd3 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/PropertyAccessorFields.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/PropertyAccessorFields.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter6 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/TrivialPropertyAccessors.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/TrivialPropertyAccessors.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/TrivialPropertyAccessors.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/TrivialPropertyAccessors.kt index 5f81ca58af..fec5142e9a 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/TrivialPropertyAccessors.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/TrivialPropertyAccessors.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter6 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/UselessSupertype.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/UselessSupertype.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/UselessSupertype.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/UselessSupertype.kt index 598f963bb0..2e57fec2ca 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/UselessSupertype.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/UselessSupertype.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules +package org.cqfn.diktat.ruleset.rules.chapter6 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/AbstractClassesRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/AbstractClassesRule.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/AbstractClassesRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/AbstractClassesRule.kt index b6baa00677..927f4757d4 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/AbstractClassesRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/AbstractClassesRule.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules.classes +package org.cqfn.diktat.ruleset.rules.chapter6.classes import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/CompactInitialization.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/CompactInitialization.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/CompactInitialization.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/CompactInitialization.kt index 3a21df2582..4c64fa4f95 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/CompactInitialization.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/CompactInitialization.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules.classes +package org.cqfn.diktat.ruleset.rules.chapter6.classes import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/DataClassesRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/DataClassesRule.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/DataClassesRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/DataClassesRule.kt index 38ad64dde7..884a85a02a 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/DataClassesRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/DataClassesRule.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules.classes +package org.cqfn.diktat.ruleset.rules.chapter6.classes import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/SingleConstructorRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/SingleConstructorRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/SingleConstructorRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/SingleConstructorRule.kt index d0180008d1..37713e15f4 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/SingleConstructorRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/SingleConstructorRule.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules.classes +package org.cqfn.diktat.ruleset.rules.chapter6.classes import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/SingleInitRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/SingleInitRule.kt similarity index 99% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/SingleInitRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/SingleInitRule.kt index 4a15f4ad12..0bb834b155 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/SingleInitRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/SingleInitRule.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules.classes +package org.cqfn.diktat.ruleset.rules.chapter6.classes import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/StatelessClassesRule.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/StatelessClassesRule.kt similarity index 98% rename from diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/StatelessClassesRule.kt rename to diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/StatelessClassesRule.kt index 8a3da3bf1d..358fa4c337 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/StatelessClassesRule.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/StatelessClassesRule.kt @@ -1,4 +1,4 @@ -package org.cqfn.diktat.ruleset.rules.classes +package org.cqfn.diktat.ruleset.rules.chapter6.classes import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.EmitType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt index 0eeec11ce1..c79d344683 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt @@ -7,7 +7,7 @@ package org.cqfn.diktat.ruleset.utils -import org.cqfn.diktat.ruleset.rules.PackageNaming +import org.cqfn.diktat.ruleset.rules.chapter1.PackageNaming import com.pinterest.ktlint.core.KtLint import com.pinterest.ktlint.core.ast.ElementType diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/Checkers.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/Checkers.kt index 3e420dc626..875df6755c 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/Checkers.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/Checkers.kt @@ -4,8 +4,8 @@ package org.cqfn.diktat.ruleset.utils.indentation -import org.cqfn.diktat.ruleset.rules.files.IndentationError -import org.cqfn.diktat.ruleset.rules.files.lastIndent +import org.cqfn.diktat.ruleset.rules.chapter3.files.IndentationError +import org.cqfn.diktat.ruleset.rules.chapter3.files.lastIndent import com.pinterest.ktlint.core.ast.ElementType.ARROW import com.pinterest.ktlint.core.ast.ElementType.AS_KEYWORD diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/CustomIndentationChecker.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/CustomIndentationChecker.kt index f76e69e8c9..ffa018cca5 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/CustomIndentationChecker.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/CustomIndentationChecker.kt @@ -4,7 +4,7 @@ package org.cqfn.diktat.ruleset.utils.indentation -import org.cqfn.diktat.ruleset.rules.files.IndentationError +import org.cqfn.diktat.ruleset.rules.chapter3.files.IndentationError import org.jetbrains.kotlin.com.intellij.psi.PsiWhiteSpace /** diff --git a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/IndentationConfig.kt b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/IndentationConfig.kt index 889fadee90..a2fb899c87 100644 --- a/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/IndentationConfig.kt +++ b/diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/indentation/IndentationConfig.kt @@ -1,7 +1,7 @@ package org.cqfn.diktat.ruleset.utils.indentation import org.cqfn.diktat.common.config.rules.RuleConfiguration -import org.cqfn.diktat.ruleset.rules.files.IndentationRule +import org.cqfn.diktat.ruleset.rules.chapter3.files.IndentationRule /** * [RuleConfiguration] for indentation logic diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/EnumValueCaseTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/EnumValueCaseTest.kt index 95b648f203..e083ee5c5f 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/EnumValueCaseTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/EnumValueCaseTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter1 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.common.config.rules.getRuleConfig import org.cqfn.diktat.ruleset.constants.Warnings -import org.cqfn.diktat.ruleset.rules.IdentifierNaming +import org.cqfn.diktat.ruleset.rules.chapter1.IdentifierNaming import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingFixTest.kt index 98ee8cd5ae..e9377e4973 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingFixTest.kt @@ -1,7 +1,7 @@ package org.cqfn.diktat.ruleset.chapter1 import org.cqfn.diktat.common.config.rules.RulesConfig -import org.cqfn.diktat.ruleset.rules.IdentifierNaming +import org.cqfn.diktat.ruleset.rules.chapter1.IdentifierNaming import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingWarnTest.kt index 3a1b28baac..ea4e5b813d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingWarnTest.kt @@ -15,7 +15,7 @@ import org.cqfn.diktat.ruleset.constants.Warnings.VARIABLE_HAS_PREFIX import org.cqfn.diktat.ruleset.constants.Warnings.VARIABLE_NAME_INCORRECT import org.cqfn.diktat.ruleset.constants.Warnings.VARIABLE_NAME_INCORRECT_FORMAT import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.IdentifierNaming +import org.cqfn.diktat.ruleset.rules.chapter1.IdentifierNaming import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/MethodNamingWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/MethodNamingWarnTest.kt index c83fd3e4ee..f72978e59d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/MethodNamingWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/MethodNamingWarnTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter1 import org.cqfn.diktat.ruleset.constants.Warnings.FUNCTION_BOOLEAN_PREFIX import org.cqfn.diktat.ruleset.constants.Warnings.FUNCTION_NAME_INCORRECT_CASE import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.IdentifierNaming +import org.cqfn.diktat.ruleset.rules.chapter1.IdentifierNaming import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackageNamingFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackageNamingFixTest.kt index 176555dc28..4c61ed6e52 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackageNamingFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackageNamingFixTest.kt @@ -1,8 +1,7 @@ package org.cqfn.diktat.ruleset.chapter1 import org.cqfn.diktat.common.config.rules.RulesConfig -import org.cqfn.diktat.ruleset.constants.Warnings.PACKAGE_NAME_MISSING -import org.cqfn.diktat.ruleset.rules.PackageNaming +import org.cqfn.diktat.ruleset.rules.chapter1.PackageNaming import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackageNamingWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackageNamingWarnTest.kt index cfcad912e9..4e2b3043b1 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackageNamingWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackageNamingWarnTest.kt @@ -8,7 +8,7 @@ import org.cqfn.diktat.ruleset.constants.Warnings.PACKAGE_NAME_INCORRECT_PREFIX import org.cqfn.diktat.ruleset.constants.Warnings.PACKAGE_NAME_INCORRECT_SYMBOLS import org.cqfn.diktat.ruleset.constants.Warnings.PACKAGE_NAME_MISSING import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.PackageNaming +import org.cqfn.diktat.ruleset.rules.chapter1.PackageNaming import org.cqfn.diktat.util.LintTestBase import org.cqfn.diktat.util.TEST_FILE_NAME diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackagePathFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackagePathFixTest.kt index 098c8d15d5..ba7aba84af 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackagePathFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackagePathFixTest.kt @@ -1,8 +1,7 @@ package org.cqfn.diktat.ruleset.chapter1 import org.cqfn.diktat.common.config.rules.RulesConfig -import org.cqfn.diktat.ruleset.constants.Warnings -import org.cqfn.diktat.ruleset.rules.PackageNaming +import org.cqfn.diktat.ruleset.rules.chapter1.PackageNaming import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/CommentsFormattingFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/CommentsFormattingFixTest.kt index ae050b748e..6f2494ac85 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/CommentsFormattingFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/CommentsFormattingFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter2 -import org.cqfn.diktat.ruleset.rules.kdoc.CommentsFormatting +import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.CommentsFormatting import org.cqfn.diktat.util.FixTestBase import generated.WarningNames.COMMENT_WHITE_SPACE diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/CommentsFormattingTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/CommentsFormattingTest.kt index d598aaeff4..646087becb 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/CommentsFormattingTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/CommentsFormattingTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter2 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.constants.Warnings.IF_ELSE_COMMENTS import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.kdoc.CommentsFormatting +import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.CommentsFormatting import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/HeaderCommentRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/HeaderCommentRuleFixTest.kt index d33e1c7440..590183d679 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/HeaderCommentRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/HeaderCommentRuleFixTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter2 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings.HEADER_MISSING_OR_WRONG_COPYRIGHT import org.cqfn.diktat.ruleset.constants.Warnings.HEADER_WRONG_FORMAT -import org.cqfn.diktat.ruleset.rules.comments.HeaderCommentRule +import org.cqfn.diktat.ruleset.rules.chapter2.comments.HeaderCommentRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/HeaderCommentRuleTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/HeaderCommentRuleTest.kt index 52493bbdfd..45d7ff2bf6 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/HeaderCommentRuleTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/HeaderCommentRuleTest.kt @@ -8,7 +8,7 @@ import org.cqfn.diktat.ruleset.constants.Warnings.HEADER_NOT_BEFORE_PACKAGE import org.cqfn.diktat.ruleset.constants.Warnings.HEADER_WRONG_FORMAT import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_CONTAINS_DATE_OR_AUTHOR import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.comments.HeaderCommentRule +import org.cqfn.diktat.ruleset.rules.chapter2.comments.HeaderCommentRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocCommentsFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocCommentsFixTest.kt index 408a76f2bd..d02504fb9b 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocCommentsFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocCommentsFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter2 -import org.cqfn.diktat.ruleset.rules.kdoc.KdocComments +import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.KdocComments import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocCommentsWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocCommentsWarnTest.kt index 33f3376a88..a44a76201f 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocCommentsWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocCommentsWarnTest.kt @@ -6,7 +6,7 @@ import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_NO_CONSTRUCTOR_PROPERTY_W import org.cqfn.diktat.ruleset.constants.Warnings.MISSING_KDOC_CLASS_ELEMENTS import org.cqfn.diktat.ruleset.constants.Warnings.MISSING_KDOC_TOP_LEVEL import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.kdoc.KdocComments +import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.KdocComments import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocFormattingFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocFormattingFixTest.kt index 675a1e994f..4011181830 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocFormattingFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocFormattingFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter2 -import org.cqfn.diktat.ruleset.rules.kdoc.KdocFormatting +import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.KdocFormatting import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocFormattingTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocFormattingTest.kt index 02f2f092cb..94a49751b4 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocFormattingTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocFormattingTest.kt @@ -11,7 +11,7 @@ import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_NO_NEWLINE_AFTER_SPECIAL_ import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_WRONG_SPACES_AFTER_TAG import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_WRONG_TAGS_ORDER import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.kdoc.KdocFormatting +import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.KdocFormatting import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocMethodsFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocMethodsFixTest.kt index 459ead6b89..440f5cdfdb 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocMethodsFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocMethodsFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter2 -import org.cqfn.diktat.ruleset.rules.kdoc.KdocMethods +import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.KdocMethods import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocMethodsTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocMethodsTest.kt index 3c8a123e3d..0e3b8fa47d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocMethodsTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocMethodsTest.kt @@ -8,7 +8,7 @@ import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_WITHOUT_RETURN_TAG import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_WITHOUT_THROWS_TAG import org.cqfn.diktat.ruleset.constants.Warnings.MISSING_KDOC_ON_FUNCTION import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.kdoc.KdocMethods +import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.KdocMethods import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocParamPresentWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocParamPresentWarnTest.kt index 95d6c374ef..ee3d654828 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocParamPresentWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocParamPresentWarnTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter2 import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_WITHOUT_PARAM_TAG import org.cqfn.diktat.ruleset.constants.Warnings.MISSING_KDOC_ON_FUNCTION import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.kdoc.KdocMethods +import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.KdocMethods import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/comments/CommentedCodeTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/comments/CommentedCodeTest.kt index ff65a11980..05517afc0c 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/comments/CommentedCodeTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/comments/CommentedCodeTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter2.comments import org.cqfn.diktat.ruleset.constants.Warnings.COMMENTED_OUT_CODE import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.comments.CommentsRule +import org.cqfn.diktat.ruleset.rules.chapter2.comments.CommentsRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/AnnotationNewLineRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/AnnotationNewLineRuleFixTest.kt index c0f72bf533..9f8df60fea 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/AnnotationNewLineRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/AnnotationNewLineRuleFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter3 -import org.cqfn.diktat.ruleset.rules.AnnotationNewLineRule +import org.cqfn.diktat.ruleset.rules.chapter3.AnnotationNewLineRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/AnnotationNewLineRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/AnnotationNewLineRuleWarnTest.kt index c4662d70c6..ac06770c59 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/AnnotationNewLineRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/AnnotationNewLineRuleWarnTest.kt @@ -1,7 +1,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.ruleset.constants.Warnings -import org.cqfn.diktat.ruleset.rules.AnnotationNewLineRule +import org.cqfn.diktat.ruleset.rules.chapter3.AnnotationNewLineRule import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.util.LintTestBase diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BlockStructureBracesFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BlockStructureBracesFixTest.kt index c7b13c38f0..ca19b19536 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BlockStructureBracesFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BlockStructureBracesFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter3 -import org.cqfn.diktat.ruleset.rules.BlockStructureBraces +import org.cqfn.diktat.ruleset.rules.chapter3.BlockStructureBraces import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BlockStructureBracesWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BlockStructureBracesWarnTest.kt index 5e68b49308..558416bc52 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BlockStructureBracesWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BlockStructureBracesWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings.BRACES_BLOCK_STRUCTURE_ERROR -import org.cqfn.diktat.ruleset.rules.BlockStructureBraces +import org.cqfn.diktat.ruleset.rules.chapter3.BlockStructureBraces import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.util.LintTestBase diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BracesRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BracesRuleFixTest.kt index 20250cdb78..98e0bcfdc5 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BracesRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BracesRuleFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter3 -import org.cqfn.diktat.ruleset.rules.BracesInConditionalsAndLoopsRule +import org.cqfn.diktat.ruleset.rules.chapter3.BracesInConditionalsAndLoopsRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BracesRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BracesRuleWarnTest.kt index b8974e76b0..c58cf5dee6 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BracesRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BracesRuleWarnTest.kt @@ -1,7 +1,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.ruleset.constants.Warnings.NO_BRACES_IN_CONDITIONALS_AND_LOOPS -import org.cqfn.diktat.ruleset.rules.BracesInConditionalsAndLoopsRule +import org.cqfn.diktat.ruleset.rules.chapter3.BracesInConditionalsAndLoopsRule import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.util.LintTestBase diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ClassLikeStructuresOrderFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ClassLikeStructuresOrderFixTest.kt index 61608d642e..8b64b99e2f 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ClassLikeStructuresOrderFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ClassLikeStructuresOrderFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter3 -import org.cqfn.diktat.ruleset.rules.ClassLikeStructuresOrderRule +import org.cqfn.diktat.ruleset.rules.chapter3.ClassLikeStructuresOrderRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ClassLikeStructuresOrderRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ClassLikeStructuresOrderRuleWarnTest.kt index e49ed03014..51b2e870f3 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ClassLikeStructuresOrderRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ClassLikeStructuresOrderRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.ruleset.constants.Warnings.BLANK_LINE_BETWEEN_PROPERTIES import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_ORDER_IN_CLASS_LIKE_STRUCTURES -import org.cqfn.diktat.ruleset.rules.ClassLikeStructuresOrderRule +import org.cqfn.diktat.ruleset.rules.chapter3.ClassLikeStructuresOrderRule import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.util.LintTestBase diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ConsecutiveSpacesRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ConsecutiveSpacesRuleFixTest.kt index 5c0d458676..7ea87ddde6 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ConsecutiveSpacesRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ConsecutiveSpacesRuleFixTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings -import org.cqfn.diktat.ruleset.rules.ConsecutiveSpacesRule +import org.cqfn.diktat.ruleset.rules.chapter3.ConsecutiveSpacesRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ConsecutiveSpacesRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ConsecutiveSpacesRuleWarnTest.kt index 3395a28035..844bdcf0ff 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ConsecutiveSpacesRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ConsecutiveSpacesRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings.TOO_MANY_CONSECUTIVE_SPACES -import org.cqfn.diktat.ruleset.rules.ConsecutiveSpacesRule +import org.cqfn.diktat.ruleset.rules.chapter3.ConsecutiveSpacesRule import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.util.LintTestBase diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EmptyBlockFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EmptyBlockFixTest.kt index 1be833ca19..2a5e899323 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EmptyBlockFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EmptyBlockFixTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings -import org.cqfn.diktat.ruleset.rules.EmptyBlock +import org.cqfn.diktat.ruleset.rules.chapter3.EmptyBlock import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EmptyBlockWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EmptyBlockWarnTest.kt index 283dcf0f9a..656ac7af05 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EmptyBlockWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EmptyBlockWarnTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings.EMPTY_BLOCK_STRUCTURE_ERROR import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.EmptyBlock +import org.cqfn.diktat.ruleset.rules.chapter3.EmptyBlock import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EnumsSeparatedFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EnumsSeparatedFixTest.kt index 1557a195a8..94a65a92bd 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EnumsSeparatedFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EnumsSeparatedFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter3 -import org.cqfn.diktat.ruleset.rules.EnumsSeparated +import org.cqfn.diktat.ruleset.rules.chapter3.EnumsSeparated import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EnumsSeparatedWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EnumsSeparatedWarnTest.kt index 5bc75272c7..6c0f9e0e1b 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EnumsSeparatedWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EnumsSeparatedWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.ruleset.constants.Warnings.ENUMS_SEPARATED import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.EnumsSeparated +import org.cqfn.diktat.ruleset.rules.chapter3.EnumsSeparated import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileSizeWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileSizeWarnTest.kt index 6981f4459b..17b5ddadb1 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileSizeWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileSizeWarnTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.files.FileSize +import org.cqfn.diktat.ruleset.rules.chapter3.files.FileSize import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileStructureRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileStructureRuleFixTest.kt index 59e4074658..62b12ccca4 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileStructureRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileStructureRuleFixTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.common.config.rules.DIKTAT_COMMON import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings -import org.cqfn.diktat.ruleset.rules.files.FileStructureRule +import org.cqfn.diktat.ruleset.rules.chapter3.files.FileStructureRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileStructureRuleTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileStructureRuleTest.kt index e433e308df..cdf4d7f621 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileStructureRuleTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileStructureRuleTest.kt @@ -7,7 +7,7 @@ import org.cqfn.diktat.ruleset.constants.Warnings.FILE_NO_BLANK_LINE_BETWEEN_BLO 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.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.files.FileStructureRule +import org.cqfn.diktat.ruleset.rules.chapter3.files.FileStructureRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LineLengthFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LineLengthFixTest.kt index 65e21c52bd..465f873782 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LineLengthFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LineLengthFixTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings.LONG_LINE -import org.cqfn.diktat.ruleset.rules.LineLength +import org.cqfn.diktat.ruleset.rules.chapter3.LineLength import org.cqfn.diktat.util.FixTestBase import org.junit.jupiter.api.Test diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LineLengthWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LineLengthWarnTest.kt index 18b9717bf0..f3e55fad03 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LineLengthWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LineLengthWarnTest.kt @@ -5,7 +5,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings.LONG_LINE import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.LineLength +import org.cqfn.diktat.ruleset.rules.chapter3.LineLength import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError @@ -60,7 +60,7 @@ class LineLengthWarnTest : LintTestBase(::LineLength) { """ |package org.cqfn.diktat.ruleset.chapter3 | - |import org.cqfn.diktat.ruleset.rules.LineLength + |import org.cqfn.diktat.ruleset.rules.chapter3.LineLength |import org.cqfn.diktat.util.lintMethod | |/** @@ -89,7 +89,7 @@ class LineLengthWarnTest : LintTestBase(::LineLength) { """ |package org.cqfn.diktat.ruleset.chapter3 | - |import org.cqfn.diktat.ruleset.rules.LineLength + |import org.cqfn.diktat.ruleset.rules.chapter3.LineLength |import org.cqfn.diktat.util.lintMethod | |/** @@ -117,7 +117,7 @@ class LineLengthWarnTest : LintTestBase(::LineLength) { """ |package org.cqfn.diktat.ruleset.chapter3 | - |import org.cqfn.diktat.ruleset.rules.LineLength + |import org.cqfn.diktat.ruleset.rules.chapter3.LineLength |import org.cqfn.diktat.util.lintMethod | |/** @@ -148,7 +148,7 @@ class LineLengthWarnTest : LintTestBase(::LineLength) { """ |package org.cqfn.diktat.ruleset.chapter3 | - |import org.cqfn.diktat.ruleset.rules.LineLength + |import org.cqfn.diktat.ruleset.rules.chapter3.LineLength |import org.cqfn.diktat.util.lintMethod | |/** @@ -179,7 +179,7 @@ class LineLengthWarnTest : LintTestBase(::LineLength) { """ |package org.cqfn.diktat.ruleset.chapter3 | - |import org.cqfn.diktat.ruleset.rules.LineLength + |import org.cqfn.diktat.ruleset.rules.chapter3.LineLength |import org.cqfn.diktat.util.lintMethod | | @@ -206,7 +206,7 @@ class LineLengthWarnTest : LintTestBase(::LineLength) { """ |package org.cqfn.diktat.ruleset.chapter3 | - |import org.cqfn.diktat.ruleset.rules.LineLength + |import org.cqfn.diktat.ruleset.rules.chapter3.LineLength |import org.cqfn.diktat.util.lintMethod | | diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LocalVariablesWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LocalVariablesWarnTest.kt index 22bab9a31c..deab1036ef 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LocalVariablesWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LocalVariablesWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.identifiers.LocalVariablesRule +import org.cqfn.diktat.ruleset.rules.chapter3.identifiers.LocalVariablesRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LongNumericalValuesSeparatedFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LongNumericalValuesSeparatedFixTest.kt index 929a620e88..75f680085f 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LongNumericalValuesSeparatedFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LongNumericalValuesSeparatedFixTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings -import org.cqfn.diktat.ruleset.rules.LongNumericalValuesSeparatedRule +import org.cqfn.diktat.ruleset.rules.chapter3.LongNumericalValuesSeparatedRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames.LONG_NUMERICAL_VALUES_SEPARATED diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LongNumericalValuesSeparatedWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LongNumericalValuesSeparatedWarnTest.kt index 020e67dbcb..b14c469dd1 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LongNumericalValuesSeparatedWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LongNumericalValuesSeparatedWarnTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.LongNumericalValuesSeparatedRule +import org.cqfn.diktat.ruleset.rules.chapter3.LongNumericalValuesSeparatedRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MultipleModifiersSequenceFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MultipleModifiersSequenceFixTest.kt index d4231aadc8..f052494e56 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MultipleModifiersSequenceFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MultipleModifiersSequenceFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter3 -import org.cqfn.diktat.ruleset.rules.MultipleModifiersSequence +import org.cqfn.diktat.ruleset.rules.chapter3.MultipleModifiersSequence import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MultipleModifiersSequenceWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MultipleModifiersSequenceWarnTest.kt index 621cd49564..cd9b5cb86c 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MultipleModifiersSequenceWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MultipleModifiersSequenceWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_MULTIPLE_MODIFIERS_ORDER import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.MultipleModifiersSequence +import org.cqfn.diktat.ruleset.rules.chapter3.MultipleModifiersSequence import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/NullableTypeRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/NullableTypeRuleFixTest.kt index 04f80165a6..f78969f34f 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/NullableTypeRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/NullableTypeRuleFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter3 -import org.cqfn.diktat.ruleset.rules.NullableTypeRule +import org.cqfn.diktat.ruleset.rules.chapter3.NullableTypeRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/NullableTypeRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/NullableTypeRuleWarnTest.kt index 2eab60842b..b54fa3e5ed 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/NullableTypeRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/NullableTypeRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.ruleset.constants.Warnings.NULLABLE_PROPERTY_TYPE import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.NullableTypeRule +import org.cqfn.diktat.ruleset.rules.chapter3.NullableTypeRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SingleLineStatementsRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SingleLineStatementsRuleFixTest.kt index 26689f3ef3..317236de90 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SingleLineStatementsRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SingleLineStatementsRuleFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter3 -import org.cqfn.diktat.ruleset.rules.SingleLineStatementsRule +import org.cqfn.diktat.ruleset.rules.chapter3.SingleLineStatementsRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SingleLineStatementsRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SingleLineStatementsRuleWarnTest.kt index 832528d7c0..9d108995c0 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SingleLineStatementsRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SingleLineStatementsRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.ruleset.constants.Warnings.MORE_THAN_ONE_STATEMENT_PER_LINE import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.SingleLineStatementsRule +import org.cqfn.diktat.ruleset.rules.chapter3.SingleLineStatementsRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SortRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SortRuleFixTest.kt index 91197be32e..f00a9f6208 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SortRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SortRuleFixTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings -import org.cqfn.diktat.ruleset.rules.SortRule +import org.cqfn.diktat.ruleset.rules.chapter3.SortRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SortRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SortRuleWarnTest.kt index fefc45cf74..69d5d238c1 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SortRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SortRuleWarnTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_DECLARATIONS_ORDER import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.SortRule +import org.cqfn.diktat.ruleset.rules.chapter3.SortRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringConcatenationWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringConcatenationWarnTest.kt index 6bc8e95281..b3c8d49a6d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringConcatenationWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringConcatenationWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.StringConcatenationRule +import org.cqfn.diktat.ruleset.rules.chapter3.StringConcatenationRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringTemplateRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringTemplateRuleFixTest.kt index 76d8a0bad2..6f584924a9 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringTemplateRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringTemplateRuleFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter3 -import org.cqfn.diktat.ruleset.rules.StringTemplateFormatRule +import org.cqfn.diktat.ruleset.rules.chapter3.StringTemplateFormatRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringTemplateRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringTemplateRuleWarnTest.kt index 2331b6680f..20cd309330 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringTemplateRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringTemplateRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.StringTemplateFormatRule +import org.cqfn.diktat.ruleset.rules.chapter3.StringTemplateFormatRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/WhenMustHaveElseFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/WhenMustHaveElseFixTest.kt index 30aacf70a6..6a91e4685d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/WhenMustHaveElseFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/WhenMustHaveElseFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter3 -import org.cqfn.diktat.ruleset.rules.WhenMustHaveElseRule +import org.cqfn.diktat.ruleset.rules.chapter3.WhenMustHaveElseRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/WhenMustHaveElseWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/WhenMustHaveElseWarnTest.kt index 19c9b6a13f..373eb7827b 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/WhenMustHaveElseWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/WhenMustHaveElseWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.WhenMustHaveElseRule +import org.cqfn.diktat.ruleset.rules.chapter3.WhenMustHaveElseRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/BlankLinesFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/BlankLinesFixTest.kt index c232a66a84..bc1f3a4391 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/BlankLinesFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/BlankLinesFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter3.files -import org.cqfn.diktat.ruleset.rules.files.BlankLinesRule +import org.cqfn.diktat.ruleset.rules.chapter3.files.BlankLinesRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/BlankLinesWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/BlankLinesWarnTest.kt index dc74c1df9b..02a2b2947b 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/BlankLinesWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/BlankLinesWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3.files import org.cqfn.diktat.ruleset.constants.Warnings.TOO_MANY_BLANK_LINES import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.files.BlankLinesRule +import org.cqfn.diktat.ruleset.rules.chapter3.files.BlankLinesRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleFixTest.kt index 7effe8c38b..0cda5145d4 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleFixTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3.files import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings -import org.cqfn.diktat.ruleset.rules.files.NewlinesRule +import org.cqfn.diktat.ruleset.rules.chapter3.files.NewlinesRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleWarnTest.kt index 3d95d8603d..61dc547f73 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleWarnTest.kt @@ -5,7 +5,7 @@ import org.cqfn.diktat.ruleset.constants.Warnings.COMPLEX_EXPRESSION import org.cqfn.diktat.ruleset.constants.Warnings.REDUNDANT_SEMICOLON import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_NEWLINES import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.files.NewlinesRule +import org.cqfn.diktat.ruleset.rules.chapter3.files.NewlinesRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleFixTest.kt index 66aba42621..12c5753db6 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleFixTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3.spaces import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_INDENTATION -import org.cqfn.diktat.ruleset.rules.files.IndentationRule +import org.cqfn.diktat.ruleset.rules.chapter3.files.IndentationRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt index ac99754e1d..5d803c7965 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter3.spaces import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_INDENTATION import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.files.IndentationRule +import org.cqfn.diktat.ruleset.rules.chapter3.files.IndentationRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/WhiteSpaceRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/WhiteSpaceRuleFixTest.kt index 260fdf8a2a..a4560c373a 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/WhiteSpaceRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/WhiteSpaceRuleFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter3.spaces -import org.cqfn.diktat.ruleset.rules.files.WhiteSpaceRule +import org.cqfn.diktat.ruleset.rules.chapter3.files.WhiteSpaceRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/WhiteSpaceRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/WhiteSpaceRuleWarnTest.kt index 18fac3f240..47260d5b39 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/WhiteSpaceRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/WhiteSpaceRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter3.spaces import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_WHITESPACE import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.files.WhiteSpaceRule +import org.cqfn.diktat.ruleset.rules.chapter3.files.WhiteSpaceRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/AccurateCalculationsWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/AccurateCalculationsWarnTest.kt index 337e82d1bb..8b45740cde 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/AccurateCalculationsWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/AccurateCalculationsWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter4 import org.cqfn.diktat.ruleset.constants.Warnings.FLOAT_IN_ACCURATE_CALCULATIONS import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.calculations.AccurateCalculationsRule +import org.cqfn.diktat.ruleset.rules.chapter4.calculations.AccurateCalculationsRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NoVarRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NoVarRuleWarnTest.kt index 456ccc48c3..2b6799be31 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NoVarRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NoVarRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter4 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.ImmutableValNoVarRule +import org.cqfn.diktat.ruleset.rules.chapter4.ImmutableValNoVarRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NullChecksRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NullChecksRuleFixTest.kt index 6e8fccd617..5962baa5f9 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NullChecksRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NullChecksRuleFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter4 -import org.cqfn.diktat.ruleset.rules.NullChecksRule +import org.cqfn.diktat.ruleset.rules.chapter4.NullChecksRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NullChecksRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NullChecksRuleWarnTest.kt index 4aab9afc8a..68f33f0eff 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NullChecksRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NullChecksRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter4 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.NullChecksRule +import org.cqfn.diktat.ruleset.rules.chapter4.NullChecksRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/SmartCastRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/SmartCastRuleFixTest.kt index 0a6dc2d4ce..99bcef5c59 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/SmartCastRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/SmartCastRuleFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter4 -import org.cqfn.diktat.ruleset.rules.SmartCastRule +import org.cqfn.diktat.ruleset.rules.chapter4.SmartCastRule import org.cqfn.diktat.util.FixTestBase import org.junit.jupiter.api.Test diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/SmartCastRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/SmartCastRuleWarnTest.kt index c7aa989b2c..263d3538bd 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/SmartCastRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/SmartCastRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter4 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.SmartCastRule +import org.cqfn.diktat.ruleset.rules.chapter4.SmartCastRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/TypeAliasRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/TypeAliasRuleWarnTest.kt index 813ca9a441..1d1275f0a6 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/TypeAliasRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/TypeAliasRuleWarnTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter4 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings.TYPE_ALIAS import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.TypeAliasRule +import org.cqfn.diktat.ruleset.rules.chapter4.TypeAliasRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/VariableGenericTypeDeclarationRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/VariableGenericTypeDeclarationRuleFixTest.kt index 13dcee4cde..25b089f83d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/VariableGenericTypeDeclarationRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/VariableGenericTypeDeclarationRuleFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter4 -import org.cqfn.diktat.ruleset.rules.VariableGenericTypeDeclarationRule +import org.cqfn.diktat.ruleset.rules.chapter4.VariableGenericTypeDeclarationRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/VariableGenericTypeDeclarationRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/VariableGenericTypeDeclarationRuleWarnTest.kt index 5e1f045fa2..ed1757d561 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/VariableGenericTypeDeclarationRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/VariableGenericTypeDeclarationRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter4 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.VariableGenericTypeDeclarationRule +import org.cqfn.diktat.ruleset.rules.chapter4.VariableGenericTypeDeclarationRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AsyncAndSyncRuleTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AsyncAndSyncRuleTest.kt index 8d904c8ea1..801482347d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AsyncAndSyncRuleTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AsyncAndSyncRuleTest.kt @@ -1,7 +1,7 @@ package org.cqfn.diktat.ruleset.chapter5 import org.cqfn.diktat.ruleset.constants.Warnings.RUN_BLOCKING_INSIDE_ASYNC -import org.cqfn.diktat.ruleset.rules.AsyncAndSyncRule +import org.cqfn.diktat.ruleset.rules.chapter5.AsyncAndSyncRule import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.util.LintTestBase diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AvoidNestedFunctionsFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AvoidNestedFunctionsFixTest.kt index f0da4fc03a..31f089403e 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AvoidNestedFunctionsFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AvoidNestedFunctionsFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter5 -import org.cqfn.diktat.ruleset.rules.AvoidNestedFunctionsRule +import org.cqfn.diktat.ruleset.rules.chapter5.AvoidNestedFunctionsRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AvoidNestedFunctionsWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AvoidNestedFunctionsWarnTest.kt index 3fe350a0c8..af733af19a 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AvoidNestedFunctionsWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AvoidNestedFunctionsWarnTest.kt @@ -1,7 +1,7 @@ package org.cqfn.diktat.ruleset.chapter5 import org.cqfn.diktat.ruleset.constants.Warnings -import org.cqfn.diktat.ruleset.rules.AvoidNestedFunctionsRule +import org.cqfn.diktat.ruleset.rules.chapter5.AvoidNestedFunctionsRule import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.util.LintTestBase diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CheckInverseMethodRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CheckInverseMethodRuleFixTest.kt index 58d7f86c7b..fdf49b9e1d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CheckInverseMethodRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CheckInverseMethodRuleFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter5 -import org.cqfn.diktat.ruleset.rules.CheckInverseMethodRule +import org.cqfn.diktat.ruleset.rules.chapter5.CheckInverseMethodRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames.INVERSE_FUNCTION_PREFERRED diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CheckInverseMethodRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CheckInverseMethodRuleWarnTest.kt index 924fd8f009..febd324311 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CheckInverseMethodRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CheckInverseMethodRuleWarnTest.kt @@ -1,7 +1,7 @@ package org.cqfn.diktat.ruleset.chapter5 import org.cqfn.diktat.ruleset.constants.Warnings -import org.cqfn.diktat.ruleset.rules.CheckInverseMethodRule +import org.cqfn.diktat.ruleset.rules.chapter5.CheckInverseMethodRule import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.util.LintTestBase diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CustomLabelsTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CustomLabelsTest.kt index 8c34f97211..56e24889f6 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CustomLabelsTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CustomLabelsTest.kt @@ -1,7 +1,7 @@ package org.cqfn.diktat.ruleset.chapter5 import org.cqfn.diktat.ruleset.constants.Warnings.CUSTOM_LABEL -import org.cqfn.diktat.ruleset.rules.CustomLabel +import org.cqfn.diktat.ruleset.rules.chapter5.CustomLabel import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.util.LintTestBase diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionArgumentsSizeWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionArgumentsSizeWarnTest.kt index 9fa4da48db..2eb26f76eb 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionArgumentsSizeWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionArgumentsSizeWarnTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter5 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings.TOO_MANY_PARAMETERS import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.FunctionArgumentsSize +import org.cqfn.diktat.ruleset.rules.chapter5.FunctionArgumentsSize import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionLengthWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionLengthWarnTest.kt index 31e05a3f17..38c0557a36 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionLengthWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionLengthWarnTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter5 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings.TOO_LONG_FUNCTION import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.FunctionLength +import org.cqfn.diktat.ruleset.rules.chapter5.FunctionLength import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaLengthWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaLengthWarnTest.kt index 5280bf48d8..69bc01f62d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaLengthWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaLengthWarnTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter5 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.LambdaLengthRule +import org.cqfn.diktat.ruleset.rules.chapter5.LambdaLengthRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaParameterOrderWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaParameterOrderWarnTest.kt index 0bc9941ac9..12def37611 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaParameterOrderWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaParameterOrderWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter5 import org.cqfn.diktat.ruleset.constants.Warnings.LAMBDA_IS_NOT_LAST_PARAMETER import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.LambdaParameterOrder +import org.cqfn.diktat.ruleset.rules.chapter5.LambdaParameterOrder import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/NestedFunctionBlockWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/NestedFunctionBlockWarnTest.kt index bc615f46aa..32126ce3ac 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/NestedFunctionBlockWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/NestedFunctionBlockWarnTest.kt @@ -3,7 +3,7 @@ package org.cqfn.diktat.ruleset.chapter5 import org.cqfn.diktat.common.config.rules.RulesConfig import org.cqfn.diktat.ruleset.constants.Warnings.NESTED_BLOCK import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.NestedFunctionBlock +import org.cqfn.diktat.ruleset.rules.chapter5.NestedFunctionBlock import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/OverloadingArgumentsFunctionWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/OverloadingArgumentsFunctionWarnTest.kt index 948cab4738..c06b6e34c2 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/OverloadingArgumentsFunctionWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/OverloadingArgumentsFunctionWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter5 import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_OVERLOADING_FUNCTION_ARGUMENTS import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.OverloadingArgumentsFunction +import org.cqfn.diktat.ruleset.rules.chapter5.OverloadingArgumentsFunction import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesFixTest.kt index b707cc831a..b5a222d4fe 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.ruleset.rules.classes.AbstractClassesRule +import org.cqfn.diktat.ruleset.rules.chapter6.classes.AbstractClassesRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames.CLASS_SHOULD_NOT_BE_ABSTRACT diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesWarnTest.kt index ff24a67335..4212c29cb4 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.classes.AbstractClassesRule +import org.cqfn.diktat.ruleset.rules.chapter6.classes.AbstractClassesRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AvoidUtilityClassWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AvoidUtilityClassWarnTest.kt index 258a952f48..b18ece73ae 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AvoidUtilityClassWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AvoidUtilityClassWarnTest.kt @@ -1,7 +1,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings.AVOID_USING_UTILITY_CLASS -import org.cqfn.diktat.ruleset.rules.AvoidUtilityClass +import org.cqfn.diktat.ruleset.rules.chapter6.AvoidUtilityClass import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.util.LintTestBase diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CompactInitializationFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CompactInitializationFixTest.kt index d13da8bab3..32200570a6 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CompactInitializationFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CompactInitializationFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.ruleset.rules.classes.CompactInitialization +import org.cqfn.diktat.ruleset.rules.chapter6.classes.CompactInitialization import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CompactInitializationWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CompactInitializationWarnTest.kt index fa72d9a22c..3f9999da94 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CompactInitializationWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CompactInitializationWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings.COMPACT_OBJECT_INITIALIZATION import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.classes.CompactInitialization +import org.cqfn.diktat.ruleset.rules.chapter6.classes.CompactInitialization import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CustomGetterSetterWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CustomGetterSetterWarnTest.kt index e2081d7c75..8650136944 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CustomGetterSetterWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CustomGetterSetterWarnTest.kt @@ -1,7 +1,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings -import org.cqfn.diktat.ruleset.rules.CustomGetterSetterRule +import org.cqfn.diktat.ruleset.rules.chapter6.CustomGetterSetterRule import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.util.LintTestBase diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/DataClassesRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/DataClassesRuleWarnTest.kt index db405a5ea8..f25d4b2f99 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/DataClassesRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/DataClassesRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.classes.DataClassesRule +import org.cqfn.diktat.ruleset.rules.chapter6.classes.DataClassesRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/EmptyPrimaryConstructorFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/EmptyPrimaryConstructorFixTest.kt index dc4830fd94..3fdf3e15a8 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/EmptyPrimaryConstructorFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/EmptyPrimaryConstructorFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.ruleset.rules.AvoidEmptyPrimaryConstructor +import org.cqfn.diktat.ruleset.rules.chapter6.AvoidEmptyPrimaryConstructor import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/EmptyPrimaryConstructorWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/EmptyPrimaryConstructorWarnTest.kt index 6ad8a138b9..11b78d74e6 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/EmptyPrimaryConstructorWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/EmptyPrimaryConstructorWarnTest.kt @@ -1,7 +1,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings.EMPTY_PRIMARY_CONSTRUCTOR -import org.cqfn.diktat.ruleset.rules.AvoidEmptyPrimaryConstructor +import org.cqfn.diktat.ruleset.rules.chapter6.AvoidEmptyPrimaryConstructor import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.util.LintTestBase diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ExtensionFunctionsSameNameWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ExtensionFunctionsSameNameWarnTest.kt index 88dc70bb41..922b4e3f4c 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ExtensionFunctionsSameNameWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ExtensionFunctionsSameNameWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.ExtensionFunctionsSameNameRule +import org.cqfn.diktat.ruleset.rules.chapter6.ExtensionFunctionsSameNameRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ImplicitBackingPropertyWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ImplicitBackingPropertyWarnTest.kt index c9878ef3b7..1d04d73c72 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ImplicitBackingPropertyWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ImplicitBackingPropertyWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.ImplicitBackingPropertyRule +import org.cqfn.diktat.ruleset.rules.chapter6.ImplicitBackingPropertyRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/PropertyAccessorFieldsWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/PropertyAccessorFieldsWarnTest.kt index 0ad029845e..c9e61fac04 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/PropertyAccessorFieldsWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/PropertyAccessorFieldsWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_NAME_OF_VARIABLE_INSIDE_ACCESSOR import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.PropertyAccessorFields +import org.cqfn.diktat.ruleset.rules.chapter6.PropertyAccessorFields import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleConstructorRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleConstructorRuleFixTest.kt index 0dd1aee75f..9c9b099053 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleConstructorRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleConstructorRuleFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.ruleset.rules.classes.SingleConstructorRule +import org.cqfn.diktat.ruleset.rules.chapter6.classes.SingleConstructorRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleConstructorRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleConstructorRuleWarnTest.kt index 7640e8e29d..7539439839 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleConstructorRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleConstructorRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings.SINGLE_CONSTRUCTOR_SHOULD_BE_PRIMARY import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.classes.SingleConstructorRule +import org.cqfn.diktat.ruleset.rules.chapter6.classes.SingleConstructorRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleInitRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleInitRuleFixTest.kt index 5a63219f85..8dcb4a39f5 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleInitRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleInitRuleFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.ruleset.rules.classes.SingleInitRule +import org.cqfn.diktat.ruleset.rules.chapter6.classes.SingleInitRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleInitRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleInitRuleWarnTest.kt index 61c189cec0..283c280976 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleInitRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleInitRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.classes.SingleInitRule +import org.cqfn.diktat.ruleset.rules.chapter6.classes.SingleInitRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/StatelessClassesRuleFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/StatelessClassesRuleFixTest.kt index f7938845b6..51987e0279 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/StatelessClassesRuleFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/StatelessClassesRuleFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.ruleset.rules.classes.StatelessClassesRule +import org.cqfn.diktat.ruleset.rules.chapter6.classes.StatelessClassesRule import org.cqfn.diktat.util.FixTestBase import generated.WarningNames.OBJECT_IS_PREFERRED diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/StatelessClassesRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/StatelessClassesRuleWarnTest.kt index 3717958826..502dc5bf03 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/StatelessClassesRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/StatelessClassesRuleWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.classes.StatelessClassesRule +import org.cqfn.diktat.ruleset.rules.chapter6.classes.StatelessClassesRule import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/TrivialPropertyAccessorsFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/TrivialPropertyAccessorsFixTest.kt index 39152ed245..1d9e11013c 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/TrivialPropertyAccessorsFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/TrivialPropertyAccessorsFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.ruleset.rules.TrivialPropertyAccessors +import org.cqfn.diktat.ruleset.rules.chapter6.TrivialPropertyAccessors import org.cqfn.diktat.util.FixTestBase import generated.WarningNames.TRIVIAL_ACCESSORS_ARE_NOT_RECOMMENDED diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/TrivialPropertyAccessorsWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/TrivialPropertyAccessorsWarnTest.kt index bcb4841bb4..ca132a7535 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/TrivialPropertyAccessorsWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/TrivialPropertyAccessorsWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.TrivialPropertyAccessors +import org.cqfn.diktat.ruleset.rules.chapter6.TrivialPropertyAccessors import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UselessSupertypeFixTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UselessSupertypeFixTest.kt index 3fb7ca28ff..eb9faab46b 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UselessSupertypeFixTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UselessSupertypeFixTest.kt @@ -1,6 +1,6 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.ruleset.rules.UselessSupertype +import org.cqfn.diktat.ruleset.rules.chapter6.UselessSupertype import org.cqfn.diktat.util.FixTestBase import generated.WarningNames diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UselessSupertypeWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UselessSupertypeWarnTest.kt index 8e2d1430f2..b9f93acc64 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UselessSupertypeWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UselessSupertypeWarnTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.chapter6 import org.cqfn.diktat.ruleset.constants.Warnings.USELESS_SUPERTYPE import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.UselessSupertype +import org.cqfn.diktat.ruleset.rules.chapter6.UselessSupertype import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressTest.kt index f4a42c0b4f..46aad95d43 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressTest.kt @@ -2,7 +2,7 @@ package org.cqfn.diktat.ruleset.utils import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.DIKTAT_RULE_SET_ID -import org.cqfn.diktat.ruleset.rules.IdentifierNaming +import org.cqfn.diktat.ruleset.rules.chapter1.IdentifierNaming import org.cqfn.diktat.util.LintTestBase import com.pinterest.ktlint.core.LintError