diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/AutoFormatTypedHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/AutoFormatTypedHandler.java
index 71103ab40610..ed499302d637 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/AutoFormatTypedHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/AutoFormatTypedHandler.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInsight.editorActions;
 
+import com.intellij.application.options.CodeStyle;
 import com.intellij.codeInsight.template.impl.editorActions.TypedActionHandlerBase;
 import com.intellij.lang.Language;
 import com.intellij.lang.java.JavaLanguage;
@@ -185,7 +186,7 @@ public class AutoFormatTypedHandler extends TypedActionHandlerBase {
     PsiFile file = project == null ? null : PsiUtilBase.getPsiFileInEditor(editor, project);
     if (file != null) {
       Language language = file.getLanguage();
-      CodeStyleSettings settings = CodeStyleSettingsManager.getInstance(project).getCurrentSettings();
+      CodeStyleSettings settings = CodeStyle.getSettings(editor);
       CommonCodeStyleSettings common = settings.getCommonSettings(language);
       return common.SPACE_AROUND_ASSIGNMENT_OPERATORS;
     }
diff --git a/platform/lang-impl/src/com/intellij/psi/codeStyle/CodeStyleSettingsCodeFragmentFilter.java b/platform/lang-impl/src/com/intellij/psi/codeStyle/CodeStyleSettingsCodeFragmentFilter.java
index 393a0d30029b..5e409a0ff11f 100644
--- a/platform/lang-impl/src/com/intellij/psi/codeStyle/CodeStyleSettingsCodeFragmentFilter.java
+++ b/platform/lang-impl/src/com/intellij/psi/codeStyle/CodeStyleSettingsCodeFragmentFilter.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.psi.codeStyle;
 
+import com.intellij.application.options.CodeStyle;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
@@ -61,12 +62,11 @@ public class CodeStyleSettingsCodeFragmentFilter {
 
   @NotNull
   public CodeStyleSettingsToShow getFieldNamesAffectingCodeFragment(LanguageCodeStyleSettingsProvider.SettingsType... types) {
-    CodeStyleSettingsManager codeStyleSettingsManager = CodeStyleSettingsManager.getInstance(myProject);
-    CodeStyleSettings clonedSettings = codeStyleSettingsManager.getCurrentSettings().clone();
+    CodeStyleSettings clonedSettings = CodeStyle.getSettings(myFile).clone();
     myCommonSettings = clonedSettings.getCommonSettings(myProvider.getLanguage());
 
     try {
-      codeStyleSettingsManager.setTemporarySettings(clonedSettings);
+      CodeStyle.setTemporarySettings(myProject, clonedSettings);
 
       String title = CodeInsightBundle.message("configure.code.style.on.fragment.dialog.title");
       SequentialModalProgressTask progressTask = new SequentialModalProgressTask(myProject, StringUtil.capitalizeWords(title, true));
@@ -107,7 +107,7 @@ public class CodeStyleSettingsCodeFragmentFilter {
       };
     }
     finally {
-      codeStyleSettingsManager.dropTemporarySettings();
+      CodeStyle.dropTemporarySettings(myProject);
     }
   }