.idea/codeStyleSettings.xml is imported to two new files:
.idea/codeStyles/codeStyleConfig.xml containing a link to preferred project code style and .
Project.xml with code style settings for different languages. The latter is optional and is created only if there are non-default settings. If
.idea directory is under version control, both files can be added to VCS too. The old
codeStyleSettings.xml is kept for backwards compatibility.