Support inline fixers for fix and warn plugin

What's done: * Added support inline fixers for fix and warn plugin Closes #221
saveourtool · Aug 31, 2021 · 8ef8558 · 8ef8558
1 parent c22931f
commit 8ef8558
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/...nd-warn-plugin/src/commonMain/kotlin/org/cqfn/save/plugins/fixandwarn/FixAndWarnPlugin.kt b/...nd-warn-plugin/src/commonMain/kotlin/org/cqfn/save/plugins/fixandwarn/FixAndWarnPlugin.kt
@@ -34,12 +34,12 @@ class FixAndWarnPlugin(
     fileSystem,
     useInternalRedirections,
     redirectTo) {
-    private val fixPluginConfig: FixPluginConfig =
-            testConfig.pluginConfigs.filterIsInstance<FixAndWarnPluginConfig>().single().fix
-    private val warnPluginConfig: WarnPluginConfig =
-            testConfig.pluginConfigs.filterIsInstance<FixAndWarnPluginConfig>().single().warn
+    private val fixAndWarnPluginConfig: FixAndWarnPluginConfig = testConfig.pluginConfigs.filterIsInstance<FixAndWarnPluginConfig>().single()
+    private val fixPluginConfig: FixPluginConfig = fixAndWarnPluginConfig.fix
+    private val warnPluginConfig: WarnPluginConfig = fixAndWarnPluginConfig.warn
     private val generalConfig: GeneralConfig =
             testConfig.pluginConfigs.filterIsInstance<GeneralConfig>().single()
+    private val inlineFixer = fixAndWarnPluginConfig.inlineFixer
     private lateinit var fixPlugin: FixPlugin
     private lateinit var warnPlugin: WarnPlugin
 
@@ -96,6 +96,10 @@ class FixAndWarnPlugin(
             }
         }
 
+        if (inlineFixer == true) {
+            1 == 1
+        }
+
         // TODO: If we receive just one command for execution, and want to avoid extra executions
         // TODO: then warn plugin should look at the fix plugin output for actual warnings, and not execute command one more time.
         // TODO: However it's required changes in warn plugin logic (it's should be able to compare expected and actual warnings from different places),

diff --git a/...n-plugin/src/commonMain/kotlin/org/cqfn/save/plugins/fixandwarn/FixAndWarnPluginConfig.kt b/...n-plugin/src/commonMain/kotlin/org/cqfn/save/plugins/fixandwarn/FixAndWarnPluginConfig.kt
@@ -18,7 +18,8 @@ import kotlinx.serialization.Transient
 @Serializable
 data class FixAndWarnPluginConfig(
     val fix: FixPluginConfig,
-    val warn: WarnPluginConfig
+    val warn: WarnPluginConfig,
+    val inlineFixer: Boolean? = null,
 ) : PluginConfig {
     override val type = TestConfigSections.`FIX AND WARN`
 
@@ -31,7 +32,8 @@ data class FixAndWarnPluginConfig(
         val mergedWarnPluginConfig = warn.mergeWith(other.warn)
         return FixAndWarnPluginConfig(
             mergedFixPluginConfig as FixPluginConfig,
-            mergedWarnPluginConfig as WarnPluginConfig
+            mergedWarnPluginConfig as WarnPluginConfig,
+            this.inlineFixer ?: otherConfig.inlineFixer
         )
     }
 
@@ -45,7 +47,8 @@ data class FixAndWarnPluginConfig(
         }
         return FixAndWarnPluginConfig(
             fix.validateAndSetDefaults(),
-            warn.validateAndSetDefaults()
+            warn.validateAndSetDefaults(),
+            inlineFixer ?: false,
         )
     }
 }
diff --git a/...lugin/src/commonNonJsTest/kotlin/org/cqfn/save/plugins/fixandwarn/FixAndWarnPluginTest.kt b/...lugin/src/commonNonJsTest/kotlin/org/cqfn/save/plugins/fixandwarn/FixAndWarnPluginTest.kt
@@ -81,7 +81,8 @@ class FixAndWarnPluginTest {
                         WarnPluginConfig(warnExecutionCmd,
                             Regex("(.+):(\\d+):(\\d+): (.+)"),
                             true, true, 1, ", ", 1, 2, 3, 1, 2, 3, 4
-                        )
+                        ),
+                        false,
                     ),
                     GeneralConfig("", listOf(""), "", "", expectedWarningsPattern = Regex("// ;warn:(\\d+):(\\d+): (.*)"))
                 ),