fix(idea_plugin): fix custom comma management strategy not being applied (#593)

Summary:
The ktfmt settings controls were putting the `toString` of the `TrailingCommaManagementStrategy` instead of the `.name` which was expected by the formatting options creation code.

Pull Request resolved: #593

Reviewed By: cortinico

Differential Revision: D92171530

Pulled By: hick209

fbshipit-source-id: 6ddb28047df42bbf097427b16dc6222310606724

Author: tKe

CHANGELOG.md

@@ -14,6 +14,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Changed
 
+### Fixed
+- Idea Plugin not applying custom trailing commas management strategy (https://github.com/facebook/ktfmt/pull/593)
+
 
 ## [0.61]
 

ktfmt_idea_plugin/src/main/kotlin/com/facebook/ktfmt/intellij/KtfmtConfigurable.kt

@@ -102,13 +102,16 @@ class KtfmtConfigurable(project: Project) :
                     .component
           }
 
-          lateinit var trailingCommaManagementStrategy: JComboBox<String>
+          lateinit var trailingCommaManagementStrategy: JComboBox<TrailingCommaManagementStrategy>
           row("Trailing commas management") {
             trailingCommaManagementStrategy =
-                comboBox(TrailingCommaManagementStrategy.values().map { it.toString() })
+                comboBox(TrailingCommaManagementStrategy.entries)
                     .bindItem(
                         getter = { settings.customTrailingCommaManagementStrategy },
-                        setter = { settings.customTrailingCommaManagementStrategy = it.orEmpty() },
+                        setter = {
+                          settings.customTrailingCommaManagementStrategy =
+                              it ?: TrailingCommaManagementStrategy.NONE
+                        },
                     )
                     .component
           }
@@ -174,13 +177,13 @@ private fun FormattingOptions.updateFields(
     maxLineLength: JTextField,
     blockIndent: JTextField,
     continuationIndent: JTextField,
-    trailingCommaManagementStrategy: JComboBox<String>,
+    trailingCommaManagementStrategy: JComboBox<TrailingCommaManagementStrategy>,
     removeUnusedImports: JCheckBox,
 ) {
   maxLineLength.text = maxWidth.toString()
   blockIndent.text = this.blockIndent.toString()
   continuationIndent.text = this.continuationIndent.toString()
-  trailingCommaManagementStrategy.selectedItem = this.trailingCommaManagementStrategy.toString()
+  trailingCommaManagementStrategy.selectedItem = this.trailingCommaManagementStrategy
   removeUnusedImports.isSelected = this.removeUnusedImports
 }
 

ktfmt_idea_plugin/src/main/kotlin/com/facebook/ktfmt/intellij/KtfmtSettings.kt

@@ -78,10 +78,10 @@ internal class KtfmtSettings(private val project: Project) :
       state.customContinuationIndent = continuationIndent.coerceAtLeast(1)
     }
 
-  var customTrailingCommaManagementStrategy: String
-    get() = state.customTrailingCommaManagementStrategy
+  var customTrailingCommaManagementStrategy: TrailingCommaManagementStrategy
+    get() = state.customTrailingCommaManagementStrategy.toTrailingCommaManagementStrategy()
     set(value) {
-      state.customTrailingCommaManagementStrategy = value
+      state.customTrailingCommaManagementStrategy = value.name
     }
 
   var customRemoveUnusedImports: Boolean
@@ -168,8 +168,8 @@ internal class KtfmtSettings(private val project: Project) :
   private fun String.toTrailingCommaManagementStrategy(
       defaultValue: TrailingCommaManagementStrategy = TrailingCommaManagementStrategy.NONE,
   ): TrailingCommaManagementStrategy =
-      runCatching { TrailingCommaManagementStrategy.valueOf(this.uppercase()) }
-          .getOrDefault(defaultValue)
+      TrailingCommaManagementStrategy.entries.find { it.name == this || it.toString() == this }
+          ?: defaultValue
 
   companion object {
     @JvmStatic