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

Apply settings to model without preview too

Browse Source 
(cherry picked from commit 397e9d9)
This commit is contained in:
Rustam Vishnyakov
2017-02-01 17:32:53 +03:00
parent 0e20c05988
commit eadd0616ac
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java
+15 -8
View File
@@ -210,14 +210,7 @@ public abstract class CodeStyleAbstractPanel implements Disposable {
PsiFile psiFile = createFileFromText(project, myTextToReformat);
prepareForReformat(psiFile);
try {
apply(mySettings);
if (myModel != null) {
myModel.fireAfterCurrentSettingsChanged();
}
}
catch (ConfigurationException ignore) {
}
applySettingsToModel();
CodeStyleSettings clone = mySettings.clone();
clone.setRightMargin(getDefaultLanguage(), getAdjustedRightMargin());
CodeStyleSettingsManager.getInstance(project).setTemporarySettings(clone);
@@ -242,6 +235,17 @@ public abstract class CodeStyleAbstractPanel implements Disposable {
});
}
private void applySettingsToModel() {
try {
apply(mySettings);
if (myModel != null) {
myModel.fireAfterCurrentSettingsChanged();
}
}
catch (ConfigurationException ignore) {
}
}
/**
* Reformats {@link #myTextToReformat target text} with the {@link #mySettings current code style settings} and returns
* list of changes applied to the target text during that.
@@ -444,6 +448,9 @@ public abstract class CodeStyleAbstractPanel implements Disposable {
UiNotifyConnector.doWhenFirstShown(myEditor.getComponent(), () -> addUpdatePreviewRequest());
}
}
else {
applySettingsToModel();
}
}
private void addUpdatePreviewRequest() {
platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java
-1
View File
@@ -223,7 +223,6 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel {
private static String getTagText(JTextField field, String defaultValue) {
String fieldText = field.getText();
if (StringUtil.isEmpty(field.getText())) {
field.setText(defaultValue);
return defaultValue;
}
return fieldText;