From 8017c6fdf631cea1fcc84c58f293e750de63b6c7 Mon Sep 17 00:00:00 2001
From: Lucas Bullen
Date: Tue, 21 Nov 2017 14:56:55 -0500
Subject: Bug 527577 - [Generic Editor] NPE in highlighter

Confirm the sourceViewer has a textWidget when performing the
getCaretOffset asynchronously

Change-Id: Ieb5cdefcd8c25f1df0d2badb092c0eb90a8ed20a
Signed-off-by: Lucas Bullen <lbullen@redhat.com>
---
 .../eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'org.eclipse.ui.genericeditor')

diff --git a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java
index d1aacdfa889..44673c8d00b 100644
--- a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java
+++ b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/DefaultWordHighlightStrategy.java
@@ -168,7 +168,7 @@ public class DefaultWordHighlightStrategy implements IReconcilingStrategy, IReco
 	public void initialReconcile() {
 		if (sourceViewer != null) {
 			sourceViewer.getTextWidget().getDisplay().asyncExec(() -> {
-				if (sourceViewer != null) {
+				if (sourceViewer != null && sourceViewer.getTextWidget() != null) {
 					applyHighlights(sourceViewer.getTextWidget().getCaretOffset());
 				}
 			});
-- 
cgit v1.2.3