From 6cc26bb52f2f2d5a9829901b185ea21acf8126f7 Mon Sep 17 00:00:00 2001 From: Stefan Oehme Date: Mon, 13 Jul 2015 09:57:42 +0200 Subject: [PATCH] guard preference values provider against missing context --- .../eclipse/xtext/preferences/IPreferenceValuesProvider.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/IPreferenceValuesProvider.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/IPreferenceValuesProvider.java index 2eefe85bb..6a835d31c 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/IPreferenceValuesProvider.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/preferences/IPreferenceValuesProvider.java @@ -38,6 +38,9 @@ public interface IPreferenceValuesProvider { @Override public IPreferenceValues getPreferenceValues(Resource context) { + if (context == null) { + return empty(); + } PreferenceValuesByLanguage valuesByLanguage = PreferenceValuesByLanguage.findInEmfObject(context.getResourceSet()); if (valuesByLanguage == null) return empty();