CodeStyleSettingsManager — use standard code.style.schemes.xml

DefaultColorSchemesManager — disable roaming

platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/ex/DefaultColorSchemesManager.java

@@ -29,7 +29,7 @@ import java.util.List;
 @State(
   name = "DefaultColorSchemesManager",
   defaultStateAsResource = true,
-  storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml")
+  storages = @Storage(file = "other.xml", roamingType = RoamingType.DISABLED)
 )
 public class DefaultColorSchemesManager implements PersistentStateComponent<Element> {
   private final List<DefaultColorsScheme> mySchemes;

platform/lang-api/src/com/intellij/psi/codeStyle/AppCodeStyleSettingsManager.java

@@ -13,20 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.psi.codeStyle;
 
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
-import com.intellij.openapi.components.StoragePathMacros;
-
 
 @State(
   name = "CodeStyleSettingsManager",
-    storages = {
-    @Storage(
-      file = StoragePathMacros.APP_CONFIG + "/other.xml"
-    )}
+  storages = {
+    @Storage(file = "code.style.schemes"),
+    @Storage(file = "other.xml", deprecated = true)
+  }
 )
-public class AppCodeStyleSettingsManager extends CodeStyleSettingsManager{
+public class AppCodeStyleSettingsManager extends CodeStyleSettingsManager {
 }

platform/platform-resources-en/src/messages/OptionsBundle.properties

@@ -321,6 +321,7 @@ exportable.BaseRefactoringSettings.presentable.name=Refactoring
 exportable.DuplocatorSettings.presentable.name=Duplocator
 exportable.MultiLanguageDuplocatorSettings.presentable.name=Duplocator
 exportable.CodeStyleSchemeSettings.presentable.name=Code Style
+exportable.CodeStyleSettingsManager.presentable.name=Code Style
 exportable.InspectionProfileManager.presentable.name=Inspection profiles
 exportable.TodoConfiguration.presentable.name=Todo
 exportable.UISettings.presentable.name=UI Settings

platform/platform-resources/src/META-INF/LangExtensions.xml

@@ -132,8 +132,7 @@
     <applicationService serviceInterface="com.intellij.ui.mac.MacMessagesEmulation"
                         serviceImplementation="com.intellij.ui.messages.JBMacMessages"/>
 
-    <applicationService serviceInterface="com.intellij.psi.codeStyle.AppCodeStyleSettingsManager"
-                        serviceImplementation="com.intellij.psi.codeStyle.AppCodeStyleSettingsManager"/>
+    <applicationService serviceImplementation="com.intellij.psi.codeStyle.AppCodeStyleSettingsManager"/>
 
     <applicationService serviceInterface="com.intellij.psi.impl.source.resolve.reference.impl.providers.FileInfoManager"
                         serviceImplementation="com.intellij.psi.impl.source.resolve.reference.impl.providers.FileInfoManager"/>