diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Config.kt b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Config.kt index 7c3c5281b..567c60d65 100644 --- a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Config.kt +++ b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Config.kt @@ -10,7 +10,7 @@ interface Config { fun valueOrDefault(key: String, default: () -> T): T class InvalidConfigurationError(msg: String = "Provided configuration file is invalid:" + - " Structure must be of type Map!") : RuntimeException(msg) + " Structure must be from type Map!") : RuntimeException(msg) companion object { val EMPTY: Config = YamlConfig(mapOf()) diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Findings.kt b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Findings.kt index 2b7df3c19..7a7a4ccce 100644 --- a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Findings.kt +++ b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Findings.kt @@ -35,7 +35,7 @@ data class Location(val source: SourceLocation, companion object { fun from(startElement: PsiElement, endElementExclusively: PsiElement?): Location { - if (endElementExclusively == null) return of(startElement) + if (endElementExclusively == null) return from(startElement) val start = startLineAndColumn(startElement) val sourceLocation = SourceLocation(start.line, start.column) val textLocation = TextLocation(startElement.startOffset, endElementExclusively.startOffset - 1) @@ -43,7 +43,7 @@ data class Location(val source: SourceLocation, startElement.getTextWithLocation(), startElement.containingFile.name) } - fun of(element: PsiElement): Location { + fun from(element: PsiElement): Location { val start = startLineAndColumn(element) val sourceLocation = SourceLocation(start.line, start.column) val textLocation = TextLocation(element.startOffset, element.endOffset) diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/DetektSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/DetektSpec.kt index 74b83de7c..cd9438912 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/DetektSpec.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/DetektSpec.kt @@ -14,7 +14,7 @@ class DetektSpec : Spek({ val detekt = Detekt(path) - it("should detect findings of more than one provider") { + it("should detect findings from more than one provider") { assertTrue { detekt.run().size >= 1 } } diff --git a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/CommentOverPrivateMethod.kt b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/CommentOverPrivateMethod.kt index 613144aa9..e24b31bbd 100644 --- a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/CommentOverPrivateMethod.kt +++ b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/CommentOverPrivateMethod.kt @@ -16,7 +16,7 @@ class CommentOverPrivateMethod(config: Config = Config.EMPTY) : CodeSmellRule("C val modifierList = function.modifierList if (modifierList != null && function.docComment != null) { if (modifierList.hasModifier(KtTokens.PRIVATE_KEYWORD)) { - addFindings(CodeSmell(id, Location.of(function.docComment!!))) + addFindings(CodeSmell(id, Location.from(function.docComment!!))) } } } diff --git a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/CommentOverPrivateProperty.kt b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/CommentOverPrivateProperty.kt index f1d0a0c44..902924267 100644 --- a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/CommentOverPrivateProperty.kt +++ b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/CommentOverPrivateProperty.kt @@ -16,7 +16,7 @@ class CommentOverPrivateProperty(config: Config = Config.EMPTY) : CodeSmellRule( val modifierList = property.modifierList if (modifierList != null && property.docComment != null) { if (modifierList.hasModifier(KtTokens.PRIVATE_KEYWORD)) { - addFindings(CodeSmell(id, Location.of(property.docComment!!))) + addFindings(CodeSmell(id, Location.from(property.docComment!!))) } } } diff --git a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/ComplexMethod.kt b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/ComplexMethod.kt index 05d43a8e8..28a30a2e1 100644 --- a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/ComplexMethod.kt +++ b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/ComplexMethod.kt @@ -20,7 +20,7 @@ class ComplexMethod(config: Config = Config.EMPTY, threshold: Int = 10) : CodeSm override fun visitNamedFunction(function: KtNamedFunction) { val mcc = MccVisitor().visit(function) if (mcc > threshold) { - addFindings(ThresholdedCodeSmell(id, Location.of(function), mcc, threshold)) + addFindings(ThresholdedCodeSmell(id, Location.from(function), mcc, threshold)) } } diff --git a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/LargeClass.kt b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/LargeClass.kt index 727015749..a71169aa5 100644 --- a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/LargeClass.kt +++ b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/LargeClass.kt @@ -38,7 +38,7 @@ class LargeClass(config: Config = Config.EMPTY, threshold: Int = 70) : CodeSmell incHead() // for class body super.visitClassOrObject(classOrObject) if (locStack.pop() > threshold) { - addFindings(CodeSmell(id, Location.of(classOrObject))) + addFindings(CodeSmell(id, Location.from(classOrObject))) } } diff --git a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/LongMethod.kt b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/LongMethod.kt index b1e4c13a6..3f81ffbcd 100644 --- a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/LongMethod.kt +++ b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/LongMethod.kt @@ -16,7 +16,7 @@ class LongMethod(config: Config = Config.EMPTY, threshold: Int = 20) : CodeSmell val body: KtBlockExpression? = function.bodyExpression.asBlockExpression() body?.let { val size = body.statements.size - if (size > threshold) addFindings(CodeSmell(id, Location.of(function))) + if (size > threshold) addFindings(CodeSmell(id, Location.from(function))) } super.visitNamedFunction(function) } diff --git a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/LongParameterList.kt b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/LongParameterList.kt index 11c26e1ce..37b4c700b 100644 --- a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/LongParameterList.kt +++ b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/LongParameterList.kt @@ -13,7 +13,7 @@ class LongParameterList(config: Config = Config.EMPTY, threshold: Int = 5) : Cod override fun visitParameterList(list: KtParameterList) { if (list.parameters.size > threshold) { - addFindings(CodeSmell(id, Location.of(list))) + addFindings(CodeSmell(id, Location.from(list))) } } } \ No newline at end of file diff --git a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/NamingConventionViolation.kt b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/NamingConventionViolation.kt index 2b5540ad6..f1767814b 100644 --- a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/NamingConventionViolation.kt +++ b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/NamingConventionViolation.kt @@ -23,13 +23,13 @@ class NamingConventionViolation(config: Config = Config.EMPTY) : Rule("NamingCon declaration.nameIdentifier?.parent?.javaClass?.let { val name = declaration.nameAsSafeName.asString() if (declaration is KtVariableDeclaration && !name.matches(variablePattern)) { - addFindings(CodeSmell(id, Location.of(declaration))) + addFindings(CodeSmell(id, Location.from(declaration))) } if (declaration is KtNamedFunction && !name.matches(methodPattern)) { - addFindings(CodeSmell(id, Location.of(declaration))) + addFindings(CodeSmell(id, Location.from(declaration))) } if (declaration is KtClassOrObject && !name.matches(classPattern)) { - addFindings(CodeSmell(id, Location.of(declaration))) + addFindings(CodeSmell(id, Location.from(declaration))) } } super.visitNamedDeclaration(declaration) diff --git a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/NoElseInWhenExpression.kt b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/NoElseInWhenExpression.kt index f23963d0c..827dd4e6a 100644 --- a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/NoElseInWhenExpression.kt +++ b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/NoElseInWhenExpression.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.psi.KtWhenExpression class NoElseInWhenExpression(config: Config = Config.EMPTY) : Rule("NoElseInWhenExpression", Severity.Defect, config) { override fun visitWhenExpression(expression: KtWhenExpression) { - if (expression.elseExpression == null) addFindings(CodeSmell(id, Location.of(expression))) + if (expression.elseExpression == null) addFindings(CodeSmell(id, Location.from(expression))) } } \ No newline at end of file diff --git a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/UselessSemicolon.kt b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/UselessSemicolon.kt index 03afc9b9b..0215e7f0b 100644 --- a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/UselessSemicolon.kt +++ b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/UselessSemicolon.kt @@ -24,11 +24,11 @@ class UselessSemicolon(config: Config = Config.EMPTY) : TokenRule("UselessSemico val psi = node.psi if (psi.isNoErrorElement() && psi.isNotPartOfEnum() && psi.isNotPartOfString()) { if (psi.isDoubleSemicolon()) { - addFindings(CodeSmell(id, Location.of(psi))) + addFindings(CodeSmell(id, Location.from(psi))) } else if (psi.isSemicolon()) { val nextLeaf = PsiTreeUtil.nextLeaf(psi) if (isSemicolonOrEOF(nextLeaf) || nextTokenHasSpaces(nextLeaf)) { - addFindings(CodeSmell(id, Location.of(psi))) + addFindings(CodeSmell(id, Location.from(psi))) } } } diff --git a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/WildcardImport.kt b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/WildcardImport.kt index 464212cdb..af885bea3 100644 --- a/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/WildcardImport.kt +++ b/detekt-rules/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/WildcardImport.kt @@ -14,7 +14,7 @@ class WildcardImport(config: Config = Config.EMPTY) : Rule("WildcardImport", Sev override fun visitImportDirective(importDirective: KtImportDirective) { val import = importDirective.importPath?.pathStr if (import != null && import.contains("*")) { - addFindings(CodeSmell(id, Location.of(importDirective))) + addFindings(CodeSmell(id, Location.from(importDirective))) } } } diff --git a/gradlew b/gradlew index 27309d923..ea7e5d27d 100755 --- a/gradlew +++ b/gradlew @@ -78,14 +78,14 @@ if [ -n "$JAVA_HOME" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." +location from your Java installation." fi else JAVACMD="java" which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." +location from your Java installation." fi # Increase the maximum file descriptors if we can. diff --git a/gradlew.bat b/gradlew.bat index 832fdb607..54e633177 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -27,7 +27,7 @@ echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo. echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo location from your Java installation. goto fail @@ -41,7 +41,7 @@ echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo. echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo location from your Java installation. goto fail @@ -79,7 +79,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar if "%ERRORLEVEL%"=="0" goto mainEnd :fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead from rem the _cmd.exe /c_ return code! if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 exit /b 1