Miscellaneous stuff / address some inspection hints (#34)

* refactor(SemverSettings): Extract common regex options Slightly deduplicate code. * chore: Remove redundant semicolons This addresses an inspection hint.
jmongard · Sep 21, 2023 · 1372b84 · 1372b84
1 parent 6ebd563
commit 1372b84
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/main/kotlin/git/semver/plugin/changelog/ChangeLogFormatter.kt b/src/main/kotlin/git/semver/plugin/changelog/ChangeLogFormatter.kt
@@ -10,7 +10,7 @@ private const val MESSAGE = "Message"
 
 class ChangeLogFormatter(private val settings: SemverSettings, private val format: ChangeLogSettings) {
 
-    private val changeLogRegex = format.changeLogPattern.toRegex(setOf(RegexOption.IGNORE_CASE, RegexOption.MULTILINE))
+    private val changeLogRegex = format.changeLogPattern.toRegex(SemverSettings.REGEX_OPTIONS)
 
     internal fun formatLog(changeLog: List<Commit>): String {
 

diff --git a/src/main/kotlin/git/semver/plugin/gradle/PrintTask.kt b/src/main/kotlin/git/semver/plugin/gradle/PrintTask.kt
@@ -22,7 +22,7 @@ open class PrintTask @Inject constructor(private val prop: () -> Any, desc: Stri
 
     @TaskAction
     fun print() {
-        val fileName = this.file;
+        val fileName = this.file
         if (fileName != null) {
             File(fileName).writeText(prop().toString(), StandardCharsets.UTF_8)
         }

diff --git a/src/main/kotlin/git/semver/plugin/semver/SemVersion.kt b/src/main/kotlin/git/semver/plugin/semver/SemVersion.kt
@@ -289,6 +289,6 @@ class SemVersion(
         val isPreRelease
             get() = prefix.isNotEmpty() || number != null
 
-        override fun toString() = prefix + (number ?: "");
+        override fun toString() = prefix + (number ?: "")
     }
 }
diff --git a/src/main/kotlin/git/semver/plugin/semver/SemverSettings.kt b/src/main/kotlin/git/semver/plugin/semver/SemverSettings.kt
@@ -1,6 +1,9 @@
 package git.semver.plugin.semver
 
 open class SemverSettings {
+    companion object {
+        val REGEX_OPTIONS = setOf(RegexOption.IGNORE_CASE, RegexOption.MULTILINE)
+    }
 
     var defaultPreRelease = "SNAPSHOT"
     var releasePattern = "\\Arelease(?:\\([^()]+\\))?:"
@@ -14,8 +17,8 @@ open class SemverSettings {
     var noDirtyCheck = false
     var noAutoBump = false
 
-    internal val releaseRegex: Regex by lazy { releasePattern.toRegex(setOf(RegexOption.IGNORE_CASE, RegexOption.MULTILINE)) }
-    internal val patchRegex: Regex by lazy { patchPattern.toRegex(setOf(RegexOption.IGNORE_CASE, RegexOption.MULTILINE)) }
-    internal val minorRegex: Regex by lazy { minorPattern.toRegex(setOf(RegexOption.IGNORE_CASE, RegexOption.MULTILINE)) }
-    internal val majorRegex: Regex by lazy { majorPattern.toRegex(setOf(RegexOption.IGNORE_CASE, RegexOption.MULTILINE)) }
+    internal val releaseRegex: Regex by lazy { releasePattern.toRegex(REGEX_OPTIONS) }
+    internal val patchRegex: Regex by lazy { patchPattern.toRegex(REGEX_OPTIONS) }
+    internal val minorRegex: Regex by lazy { minorPattern.toRegex(REGEX_OPTIONS) }
+    internal val majorRegex: Regex by lazy { majorPattern.toRegex(REGEX_OPTIONS) }
 }