Merge (instead of overriding) IDEA's code style config

[a141199]

Is there a way to get this feature back? it used to move things like ID to the top and all other kinds of niceties.

[shyiko]

Hi.
I'm not sure what you mean but if you are seeing a different behavior in the way Intellij handles XML after you applied ktlint --apply-to-idea-project - you must have had a custom code style. You can switch to a previous scheme / change the settings by going to File -> Settings... -> Editor -> Code Style -> XML.

[YuraLaguta]

@shyiko the problem is that ktlint --apply-to-idea-project removes some very valuable settings from ".idea/codeStyles/Project.xml" is there a way to merge them? or add some without removing everything else? or add those configurations to ktlint --apply-to-idea-project --android
this is most likely part responsible for that: https://gist.github.com/Yurii-Laguta/846626db13de851926aee6393bb3ba3a

[shyiko]

Thank you, @Yurii-Laguta. I'll take a look.

[arunvelsriram]

I was looking into the code for fixing this issue. I would like to clarify my understanding of the expected behavior.

Actual behavior:

.idea/codeStyles/Project.xml is replaced by ktlint/src/main/resources/project-config/.idea/codeStyles/Project.xml

Expected behavior:

If .idea/codeStyles/Project.xml exists then merge it with ktlint/src/main/resources/project-config/.idea/codeStyles/Project.xml. When merging, the contents of ktlint/src/main/resources/project-config/.idea/codeStyles/Project.xml will be given higher preference.

[Tapchicoma]

When merging, the contents of ktlint/src/main/resources/project-config/.idea/codeStyles/Project.xml will be given higher preference.

I would say this should depend on --force flag value.

[romtsn]

Closing this as we are going to deprecate the current IDEA-integration in favor of integration via .editorconfig (#701)