From 296245fe5a789cff2ac2068f6dba833b07d51645 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Fri, 17 Oct 2014 14:18:21 +0400 Subject: [PATCH] Change assertion to writeExternal exception (logged, no UI dialog) --- .../src/com/intellij/psi/codeStyle/CodeStyleSettings.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java index 95f733e56ebd..9b8bb18ff196 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java @@ -597,7 +597,9 @@ public class CodeStyleSettings extends CommonCodeStyleSettings implements Clonea for (final CustomCodeStyleSettings settings : customSettings) { final CustomCodeStyleSettings parentCustomSettings = parentSettings.getCustomSettings(settings.getClass()); - assert parentCustomSettings != null : "Custom settings are null for " + settings.getClass(); + if (parentCustomSettings == null) { + throw new WriteExternalException("Custom settings are null for " + settings.getClass()); + } settings.writeExternal(element, parentCustomSettings); }