Commit 0706af66 authored by Rustam Vishnyakov's avatar Rustam Vishnyakov
Browse files

Migration to PsiFile-based CodeStyle API

parent 24ea2a5b
Showing with 4 additions and 8 deletions
+4 -8
......@@ -15,6 +15,7 @@
*/
package com.intellij.java.codeInsight;
import com.intellij.application.options.CodeStyle;
import com.intellij.codeInsight.generation.EqualsHashCodeTemplatesManager;
import com.intellij.codeInsight.generation.GenerateEqualsHelper;
import com.intellij.openapi.fileEditor.FileDocumentManager;
......@@ -22,7 +23,6 @@ import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiField;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.psi.codeStyle.JavaCodeStyleSettings;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.testFramework.LightCodeInsightTestCase;
......@@ -68,11 +68,10 @@ public abstract class GenerateEqualsTestCase extends LightCodeInsightTestCase {
Function<PsiField[], PsiField[]> nonNull,
boolean insertOverride,
boolean useAccessors) {
CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()).clone();
CodeStyleSettings settings = CodeStyle.getSettings(getProject()).clone();
settings.getCustomSettings(JavaCodeStyleSettings.class).GENERATE_FINAL_LOCALS = true;
settings.getCustomSettings(JavaCodeStyleSettings.class).INSERT_OVERRIDE_ANNOTATION = insertOverride;
CodeStyleSettingsManager.getInstance(getProject()).setTemporarySettings(settings);
try {
CodeStyle.doWithTemporarySettings(getProject(), settings, () -> {
PsiElement element = getFile().findElementAt(getEditor().getCaretModel().getOffset());
if (element == null) return;
PsiClass aClass = PsiTreeUtil.getParentOfType(element, PsiClass.class);
......@@ -80,10 +79,7 @@ public abstract class GenerateEqualsTestCase extends LightCodeInsightTestCase {
PsiField[] fields = aClass.getFields();
new GenerateEqualsHelper(getProject(), aClass, equals.fun(fields), hashCode.fun(fields), nonNull.fun(fields), false, useAccessors).invoke();
FileDocumentManager.getInstance().saveAllDocuments();
}
finally {
CodeStyleSettingsManager.getInstance(getProject()).dropTemporarySettings();
}
});
}
private static PsiField[] getIndexed(PsiField[] fields, int[] indices) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment