diff options
| author | Lucas Bullen | 2017-11-21 19:56:55 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2017-11-21 20:00:59 +0000 |
| commit | 8017c6fdf631cea1fcc84c58f293e750de63b6c7 (patch) | |
| tree | c410c908f1a6d5b6328ba71136487e358e9839ff | |
| parent | b3b9006b1a0f94086ab1779ab14d8b5ae950b741 (diff) | |
| download | eclipse.platform.text-8017c6fdf631cea1fcc84c58f293e750de63b6c7.tar.gz eclipse.platform.text-8017c6fdf631cea1fcc84c58f293e750de63b6c7.tar.xz eclipse.platform.text-8017c6fdf631cea1fcc84c58f293e750de63b6c7.zip | |
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>
3 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.ui.genericeditor.examples/src/org/eclipse/ui/genericeditor/examples/dotproject/HighlightStrategy.java b/org.eclipse.ui.genericeditor.examples/src/org/eclipse/ui/genericeditor/examples/dotproject/HighlightStrategy.java index 58d1b9060a2..ed89e4d206e 100644 --- a/org.eclipse.ui.genericeditor.examples/src/org/eclipse/ui/genericeditor/examples/dotproject/HighlightStrategy.java +++ b/org.eclipse.ui.genericeditor.examples/src/org/eclipse/ui/genericeditor/examples/dotproject/HighlightStrategy.java @@ -155,7 +155,7 @@ public class HighlightStrategy implements IReconcilingStrategy, IReconcilingStra public void initialReconcile() { if (sourceViewer != null) { sourceViewer.getTextWidget().getDisplay().asyncExec(() -> { - if (sourceViewer != null) { + if (sourceViewer != null && sourceViewer.getTextWidget() != null) { applyHighlights(sourceViewer.getTextWidget().getCaretOffset()); } }); diff --git a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/HighlightStrategy.java b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/HighlightStrategy.java index 0785d808b1a..fe71a1a9f2d 100644 --- a/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/HighlightStrategy.java +++ b/org.eclipse.ui.genericeditor.tests/src/org/eclipse/ui/genericeditor/tests/contributions/HighlightStrategy.java @@ -107,7 +107,7 @@ public class HighlightStrategy implements IReconcilingStrategy, IReconcilingStra public void initialReconcile() { if (sourceViewer != null) { sourceViewer.getTextWidget().getDisplay().asyncExec(() -> { - if (sourceViewer != null) { + if (sourceViewer != null && sourceViewer.getTextWidget() != null) { applyHighlights(); } }); 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()); } }); |