From a643a0177561d62db19bb80c42df5ecf40b98011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Wed, 16 Jan 2019 15:14:38 +0100 Subject: [PATCH] [platform] UIThemeProvider: log more details on errors loading theme.json, fix possible NPE --- .../platform-impl/src/com/intellij/ide/ui/UIThemeProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/UIThemeProvider.java b/platform/platform-impl/src/com/intellij/ide/ui/UIThemeProvider.java index bca7edac6305..c8f0289300d1 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/UIThemeProvider.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/UIThemeProvider.java @@ -32,7 +32,7 @@ public final class UIThemeProvider implements PluginAware { } catch (IOException e) { Logger.getInstance(getClass()).warn("error loading UITheme '" + path + "', " + - "pluginId=" + myDescriptor.getPluginId().getIdString(), e); + "pluginId=" + (myDescriptor != null ? myDescriptor.getPluginId().getIdString() : "(none)"), e); return null; } }