MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-13 15:52:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Java. Code Formatting] Append version attribute to java codestyle tag only when migrated change is different old one

Browse Source 
IDEA-110857

GitOrigin-RevId: 23301809e23ffb7ded85b8209349c79f3dcb9128
This commit is contained in:
Georgii Ustinov
2024-07-11 19:46:40 +03:00
committed by intellij-monorepo-bot
parent 81b5cce646
commit 122fe0ae87
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/codeStyles/Project.xml generated
View File

@@ -13,7 +13,7 @@
<option name="STATIC_METHODS_ORDER_WEIGHT" value="5" />
<option name="METHODS_ORDER_WEIGHT" value="4" />
</GroovyCodeStyleSettings>
<JavaCodeStyleSettings version="1">
<JavaCodeStyleSettings>
<option name="FIELD_NAME_PREFIX" value="my" />
<option name="STATIC_FIELD_NAME_PREFIX" value="our" />
<option name="PREFER_LONGER_NAMES" value="false" />

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

@@ -23,6 +23,7 @@ public class JavaCodeStyleSettings extends CustomCodeStyleSettings implements Im
private static final int CURRENT_VERSION = 1;
private int myVersion = CURRENT_VERSION;
private int myOldVersion = 0;
private boolean myIsInitialized = false;
@@ -430,7 +431,7 @@ 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()));
myOldVersion = myVersion = CustomCodeStyleSettingsUtils.readVersion(parentElement.getChild(getTagName()));
myIsInitialized = true;
}
@@ -448,22 +449,31 @@ public class JavaCodeStyleSettings extends CustomCodeStyleSettings implements Im
* It might create a tag with empty body, in cases when custom options have
* default value and this value is different from common options
* @param parentElement root element in {@link CodeStyleScheme} xml file.
* @see JavaCodeStyleSettings#areMigratedCustomOptionsHaveDefaultValueDifferentFromCommonOptions
* @see JavaCodeStyleSettings#shouldWriteVersion()
*/
private void writeVersion(@NotNull Element parentElement) {
if (myVersion != CURRENT_VERSION) return;
if (!shouldWriteVersion()) return;
Element settingsTag = parentElement.getChild(getTagName());
if (settingsTag == null && areMigratedCustomOptionsHaveDefaultValueDifferentFromCommonOptions()) {
if (settingsTag == null) {
parentElement.addContent(new Element(getTagName()));
settingsTag = parentElement.getChild(getTagName());
}
CustomCodeStyleSettingsUtils.writeVersion(settingsTag, myVersion);
myOldVersion = myVersion;
}
private boolean areMigratedCustomOptionsHaveDefaultValueDifferentFromCommonOptions() {
private boolean shouldWriteVersion() {
if (myVersion != CURRENT_VERSION) return false;
if (myOldVersion == myVersion) return true;
if (myOldVersion == 0 && !isFirstMigrationPreserved()) return true;
return false;
}
private boolean isFirstMigrationPreserved() {
CommonCodeStyleSettings commonSettings = getCommonSettings();
JavaCodeStyleSettings defaultCustomSettings = getDefaultCustomSettings();
return BLANK_LINES_AROUND_FIELD_WITH_ANNOTATIONS == defaultCustomSettings.BLANK_LINES_AROUND_FIELD_WITH_ANNOTATIONS && commonSettings.BLANK_LINES_AROUND_FIELD != BLANK_LINES_AROUND_FIELD_WITH_ANNOTATIONS;
return commonSettings.BLANK_LINES_AROUND_FIELD == BLANK_LINES_AROUND_FIELD_WITH_ANNOTATIONS;
}
public static JavaCodeStyleSettings getInstance(@NotNull PsiFile file) {