Add null guards and more error logging to force on-save handler.

metaborg · Mar 14, 2014 · e0de767 · e0de767
1 parent ab61ad5
commit e0de767
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...trategoxt.imp.metatooling/src/org/strategoxt/imp/metatooling/building/AntForceOnSave.java b/...trategoxt.imp.metatooling/src/org/strategoxt/imp/metatooling/building/AntForceOnSave.java
@@ -14,7 +14,12 @@ public class AntForceOnSave {
     public static void main(String[] args) {
     	for(String arg : args) {
 			try {
+				System.out.println("Forcing on-save handler for: " + arg);
 				FileState fileState = FileState.getFile(new Path(arg), null);
+				if(fileState == null) {
+					Environment.logException("Could not call on-save handler. File state could not be retrieved.");
+					continue;
+				}
 	    		IStrategoTerm ast = fileState.getAnalyzedAst();
 	    		OnSaveService onSave = fileState.getDescriptor().createService(OnSaveService.class, fileState.getParseController());
 	    		onSave.invokeOnSave(ast);

diff --git a/org.strategoxt.imp.runtime/src/org/strategoxt/imp/runtime/FileState.java b/org.strategoxt.imp.runtime/src/org/strategoxt/imp/runtime/FileState.java
@@ -60,8 +60,9 @@ protected FileState(Descriptor descriptor) {
 	 */
 	public static FileState getFile(IPath path, IDocument document)
 			throws FileNotFoundException, BadDescriptorException, ModelException {
-
 		Language language = LanguageRegistry.findLanguage(path, document);
+		if(language == null)
+			return null;
 		Descriptor descriptor = Environment.getDescriptor(language);
 		IResource resource = EditorIOAgent.getResource(path.toFile());
 		if (descriptor == null) return null;