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

Diagnostics for improper implementation of LanguageCodeStyleSettingsProvider.getDefaultCommonSettings()

Browse Source
This commit is contained in:
Rustam Vishnyakov
2018-08-14 13:48:28 +03:00
parent c9b79a3d36
commit 3a4aa34c29
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettingsManager.java
+14 -2
View File
@@ -16,6 +16,7 @@
package com.intellij.psi.codeStyle;
import com.intellij.lang.Language;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.JDOMUtil;
@@ -49,6 +50,8 @@ class CommonCodeStyleSettingsManager {
@NonNls static final String COMMON_SETTINGS_TAG = "codeStyleSettings";
private static final String LANGUAGE_ATTR = "language";
private static final Logger LOG = Logger.getInstance(CommonCodeStyleSettingsManager.class);
private static class DefaultsHolder {
private final static CommonCodeStyleSettings SETTINGS = new CommonCodeStyleSettings(Language.ANY);
static {
@@ -116,7 +119,7 @@ class CommonCodeStyleSettingsManager {
for (final LanguageCodeStyleSettingsProvider provider : providers) {
Language target = provider.getLanguage();
if (!myCommonSettingsMap.containsKey(target)) {
CommonCodeStyleSettings initialSettings = provider.getDefaultCommonSettings();
CommonCodeStyleSettings initialSettings = getAndCheckDefaults(provider);
if (initialSettings != null) {
init(initialSettings, target);
}
@@ -173,7 +176,7 @@ class CommonCodeStyleSettingsManager {
if (isKnownLanguage) {
final LanguageCodeStyleSettingsProvider provider = LanguageCodeStyleSettingsProvider.forLanguage(target);
if (provider != null) {
CommonCodeStyleSettings settings = provider.getDefaultCommonSettings();
CommonCodeStyleSettings settings = getAndCheckDefaults(provider);
if (settings != null) {
settings.readExternal(commonSettingsElement);
init(settings, target);
@@ -192,6 +195,15 @@ class CommonCodeStyleSettingsManager {
}
}
private static CommonCodeStyleSettings getAndCheckDefaults(LanguageCodeStyleSettingsProvider provider) {
CommonCodeStyleSettings defaultSettings = provider.getDefaultCommonSettings();
if (defaultSettings instanceof CodeStyleSettings) {
LOG.error(
"#" + provider.getLanguageName() + " language plugin must not instantiate root CodeStyleSettings in getDefaultCommonSettings()");
}
return defaultSettings;
}
public void writeExternal(@NotNull Element element) throws WriteExternalException {
synchronized (this) {
if (myCommonSettingsMap == null) {