configure codeStyles for intellij import

gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineIdea.groovy

@@ -152,6 +152,11 @@ class BaselineIdea extends AbstractBaselinePlugin {
 
     private void addCodeStyleIntellijImport() {
         def ideaStyleFile = project.file("${configDir}/idea/intellij-java-palantir-style.xml")
+        // This runs eagerly, so the file might not exist if we haven't run `baselineUpdateConfig` yet.
+        // Thus, don't do anything if the file is not there yet.
+        if (!ideaStyleFile.isFile()) {
+            return
+        }
 
         def ideaStyle = new XmlParser().parse(ideaStyleFile)
                 .component
@@ -176,10 +181,15 @@ class BaselineIdea extends AbstractBaselinePlugin {
                 project.file(".idea/codeStyles/Project.xml"),
                 {
                     def codeScheme = GroovyXmlUtils.matchOrCreateChild(it, "code_scheme", [name: 'Project'])
-                    // Just add the default configuration nodes on top of whatever nodes already exist
-                    // We could be better about this, but IDEA will mostly resolve the duplicates here for us
-                    ideaStyleSettings.value.option.forEach {
-                        codeScheme.append(it)
+                    codeScheme.attributes().putIfAbsent("version", 173)
+                    def javaCodeStyleSettings = GroovyXmlUtils.matchOrCreateChild(codeScheme, "JavaCodeStyleSettings")
+                    // Avoid re-adding duplicate options to the project. This allows users to override settings based
+                    // on preference.
+                    ideaStyleSettings.value.option.forEach { ideaStyleSetting ->
+                        def settingName = ideaStyleSetting.attributes().get("name")
+                        if (settingName != null && javaCodeStyleSettings["option"].find { it.attributes().get("name") == settingName } == null) {
+                            javaCodeStyleSettings.append(ideaStyleSetting)
+                        }
                     }
                 },
                 {

gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineIdeaIntegrationTest.groovy

@@ -141,7 +141,8 @@ class BaselineIdeaIntegrationTest extends AbstractPluginTest {
 
         def ideaStyleSettings = new File(projectDir, ".idea/codeStyles/Project.xml").text
         ideaStyleSettings.startsWith('<component name="ProjectCodeStyleConfiguration">')
-        ideaStyleSettings.contains('<code_scheme name="Project">')
+        ideaStyleSettings.contains('<code_scheme name="Project" version="173">')
+        ideaStyleSettings.contains('<JavaCodeStyleSettings>')
         ideaStyleSettings.contains('<option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true"/>')
         ideaStyleSettings.endsWith("""
               </code_scheme>