MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Java. Code Formatting] Implement simple migration mechanism for JavaCodeStyleSettings

Browse Source 
IDEA-110857

GitOrigin-RevId: 5f31d21d695af1e56a0dc0942a817a61e41b2384
This commit is contained in:
Georgii Ustinov
2024-07-08 15:21:47 +03:00
committed by intellij-monorepo-bot
parent 91bb703ebd
commit 3fb4fbf41e
1 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
java/java-frontback-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
View File

@@ -3,6 +3,7 @@ package com.intellij.psi.codeStyle;
import com.intellij.application.options.CodeStyle;
import com.intellij.configurationStore.Property;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.WriteExternalException;
@@ -19,6 +20,12 @@ import java.util.Collection;
import java.util.List;
public class JavaCodeStyleSettings extends CustomCodeStyleSettings implements ImportsLayoutSettings {
private static final int CURRENT_VERSION = 1;
private int myVersion = CURRENT_VERSION;
private boolean myIsInitialized = false;
private static final String REPEAT_ANNOTATIONS = "REPEAT_ANNOTATIONS";
private static final String REPEAT_ANNOTATIONS_ITEM = "ANNO";
private static final String DO_NOT_IMPORT_INNER = "DO_NOT_IMPORT_INNER";
@@ -413,6 +420,8 @@ public class JavaCodeStyleSettings extends CustomCodeStyleSettings implements Im
cloned.PACKAGES_TO_USE_IMPORT_ON_DEMAND.copyFrom(PACKAGES_TO_USE_IMPORT_ON_DEMAND);
cloned.IMPORT_LAYOUT_TABLE = new PackageEntryTable();
cloned.IMPORT_LAYOUT_TABLE.copyFrom(IMPORT_LAYOUT_TABLE);
cloned.myVersion = myVersion;
cloned.myIsInitialized = myIsInitialized;
return cloned;
}
@@ -421,6 +430,8 @@ public class JavaCodeStyleSettings extends CustomCodeStyleSettings implements Im
super.readExternal(parentElement);
readExternalCollection(parentElement, myRepeatAnnotations, REPEAT_ANNOTATIONS, REPEAT_ANNOTATIONS_ITEM);
readExternalCollection(parentElement, myDoNotImportInner, DO_NOT_IMPORT_INNER, DO_NOT_IMPORT_INNER_ITEM);
myVersion = CustomCodeStyleSettingsUtils.readVersion(parentElement.getChild(getTagName()));
myIsInitialized = true;
}
@Override
@@ -428,6 +439,16 @@ public class JavaCodeStyleSettings extends CustomCodeStyleSettings implements Im
super.writeExternal(parentElement, parentSettings);
writeExternalCollection(parentElement, myRepeatAnnotations, REPEAT_ANNOTATIONS, REPEAT_ANNOTATIONS_ITEM);
writeExternalCollection(parentElement, myDoNotImportInner, DO_NOT_IMPORT_INNER, DO_NOT_IMPORT_INNER_ITEM);
writeVersion(parentElement);
}
private void writeVersion(@NotNull Element parentElement) {
Element settingsTag = parentElement.getChild(getTagName());
if (settingsTag == null) {
parentElement.addContent(new Element(getTagName()));
settingsTag = parentElement.getChild(getTagName());
}
CustomCodeStyleSettingsUtils.writeVersion(settingsTag, myVersion);
}
public static JavaCodeStyleSettings getInstance(@NotNull PsiFile file) {
@@ -455,6 +476,10 @@ public class JavaCodeStyleSettings extends CustomCodeStyleSettings implements Im
}
}
private CommonCodeStyleSettings getCommonSettings() {
return getContainer().getCommonSettings(JavaLanguage.INSTANCE);
}
private void writeExternalCollection(Element parentElement,
Collection<String> collection,
String collectionName,
@@ -475,6 +500,19 @@ public class JavaCodeStyleSettings extends CustomCodeStyleSettings implements Im
@Override
protected void afterLoaded() {
migrateNonVersionedSettings();
if (myIsInitialized) {
if (myVersion < 1) migrateSettingsToVersion1();
myVersion = CURRENT_VERSION;
}
}
private void migrateSettingsToVersion1() {
CommonCodeStyleSettings commonCodeStyleSettings = getCommonSettings();
BLANK_LINES_AROUND_FIELD_WITH_ANNOTATIONS = commonCodeStyleSettings.BLANK_LINES_AROUND_FIELD;
}
private void migrateNonVersionedSettings() {
REPLACE_INSTANCEOF_AND_CAST |= REPLACE_CAST || REPLACE_INSTANCEOF;
REPLACE_CAST = REPLACE_INSTANCEOF = false;
}