Add options for ConfigFactory to handle customConfig properly

src/main/kotlin/com/sourcegraph/config/ConfigUtil.kt

@@ -141,11 +141,13 @@ object ConfigUtil {
 
     return try {
       val text = customConfigContent ?: getSettingsFile(project).readText()
-      val config = ConfigFactory.parseString(text).resolve()
+      var config = ConfigFactory.parseString(text).resolve()
       additionalProperties.forEach { (key, value) ->
-        config.withValue(key, ConfigValueFactory.fromAnyRef(value))
+        config = config.withValue(key, ConfigValueFactory.fromAnyRef(value))
       }
-      config.root().render(ConfigRenderOptions.defaults().setOriginComments(false))
+      config
+          .root()
+          .render(ConfigRenderOptions.defaults().setComments(false).setOriginComments(false))
     } catch (e: Exception) {
       logger.info("No user defined settings file found. Proceeding with empty custom config")
       ""

src/test/kotlin/com/sourcegraph/config/ConfigUtilTest.kt

@@ -0,0 +1,66 @@
+import com.google.gson.JsonParser
+import com.intellij.openapi.project.Project
+import com.sourcegraph.config.ConfigUtil
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Test
+import org.mockito.Mockito.mock
+
+class ConfigUtils {
+
+  private val mockProject = mock(Project::class.java)
+
+  @Test
+  fun testGetCustomConfiguration_addsAdditionalProperties() {
+    val input =
+        """
+    {
+      "cody.debug": true,
+      "cody.autocomplete.enabled": true
+    }
+    """
+    val result = ConfigUtil.getCustomConfiguration(mockProject, input)
+    val parsed = JsonParser.parseString(result).asJsonObject
+
+    assertEquals(
+        "indentation-based",
+        parsed
+            .get("cody")
+            .asJsonObject
+            .get("experimental")
+            .asJsonObject
+            .get("foldingRanges")
+            .asString)
+  }
+
+  @Test
+  fun testGetCustomConfiguration_handlesTrailingCommas() {
+    val input =
+        """
+    {
+      "cody.debug": true,
+      "cody.autocomplete.enabled": true,
+    }
+    """
+    val result = ConfigUtil.getCustomConfiguration(mockProject, input)
+    assertNotNull(result)
+    val parsed = JsonParser.parseString(result).asJsonObject
+    assertEquals(2 + 1, parsed.size()) // +1 for the additional folding property
+  }
+
+  @Test
+  fun testGetCustomConfiguration_handlesComments() {
+    val input =
+        """
+    {
+       // This is a comment
+      "cody.debug": true,
+      "cody.autocomplete.enabled": true,
+    }
+    """
+    val result = ConfigUtil.getCustomConfiguration(mockProject, input)
+    assertNotNull(result)
+    val parsed = JsonParser.parseString(result).asJsonObject
+    assertEquals(2 + 1, parsed.size()) // +1 for the additional folding property
+  }
+}