MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Migration to PsiFile-based Code Style API

Browse Source
This commit is contained in:
Rustam Vishnyakov
2018-03-23 20:05:30 +03:00
parent 927183a816
commit 0b0338940e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/editorActions/AutoFormatTypedHandler.java
+2 -1
View File
@@ -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;
}
platform/lang-impl/src/com/intellij/psi/codeStyle/CodeStyleSettingsCodeFragmentFilter.java
+4 -4
View File
@@ -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);
}
}