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

Separate ActionScript/JS formatter settings (using language dialect), fixed tests

Browse Source
This commit is contained in:
Rustam.Vishnyakov
2011-03-04 18:39:36 +03:00
parent c2147940bb
commit cf29acb9fe
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettingsManager.java
+9 -7
View File
@@ -52,7 +52,10 @@ public class CommonCodeStyleSettingsManager implements JDOMExternalizable {
* shared between several languages.
*/
public CommonCodeStyleSettings getCommonSettings(Language lang) {
if (myCommonSettingsMap == null) initCommonSettings();
if (myCommonSettingsMap == null) {
initCommonSettingsMap();
initNonReadSettings();
}
CommonCodeStyleSettings settings = myCommonSettingsMap.get(lang);
if (settings != null) {
return settings;
@@ -60,8 +63,8 @@ public class CommonCodeStyleSettingsManager implements JDOMExternalizable {
return myParentSettings;
}
private void initCommonSettings() {
initCommonSettingsMap();
private void initNonReadSettings() {
final LanguageCodeStyleSettingsProvider[] providers = Extensions.getExtensions(LanguageCodeStyleSettingsProvider.EP_NAME);
for (final LanguageCodeStyleSettingsProvider provider : providers) {
if (!myCommonSettingsMap.containsKey(provider.getLanguage())) {
@@ -117,6 +120,7 @@ public class CommonCodeStyleSettingsManager implements JDOMExternalizable {
}
}
}
initNonReadSettings();
}
@Override
@@ -133,10 +137,8 @@ public class CommonCodeStyleSettingsManager implements JDOMExternalizable {
final CommonCodeStyleSettings commonSettings = myCommonSettingsMap.get(language);
Element commonSettingsElement = new Element(COMMON_SETTINGS_TAG);
commonSettings.writeExternal(commonSettingsElement);
if (!commonSettingsElement.getContent().isEmpty()) {
commonSettingsElement.setAttribute(LANGUAGE_ATTR, language.getID());
element.addContent(commonSettingsElement);
}
commonSettingsElement.setAttribute(LANGUAGE_ATTR, language.getID());
element.addContent(commonSettingsElement);
}
}
}