From c34c52f440e8087cdf509e6cb6b03efcf94b8f88 Mon Sep 17 00:00:00 2001
From: nsingh <nsingh@pivotal.io>
Date: Thu, 28 Sep 2017 18:55:24 -0700
Subject: [PATCH] Fixed NPE in additional edit

---
 .../ide/vscode/boot/java/snippets/JavaSnippetCompletion.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetCompletion.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetCompletion.java
index 0be2d8366..bf3eb74c2 100644
--- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetCompletion.java
+++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/snippets/JavaSnippetCompletion.java
@@ -76,6 +76,6 @@ public class JavaSnippetCompletion implements ICompletionProposal{
 
 		DocumentEdits edit = rewrite.createEdit(query.getDocument());
 
-		return Optional.of(edit);
+		return edit != null ?  Optional.of(edit) : Optional.empty();
 	}
 }