| commit | f0787d418f95344475df362e0c927927a607540b | [log] [tgz] |
|---|---|---|
| author | Christian Dietrich <christian.dietrich@itemis.de> | Fri Jul 16 07:28:02 2021 +0200 |
| committer | Andrey Loskutov <loskutov@gmx.de> | Fri Jul 16 01:47:09 2021 -0400 |
| tree | 76f561f3184898c26704118c1b562bf10c02ce7a | |
| parent | 3e2b7500a985ecddb08f3a421fa9a80c058f4442 [diff] |
Bug 537415 Fix npe in ContentAssistant.show Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de> Change-Id: I036cd02358c48e7e94871d4397cfacecbda63e5f Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.text/+/183111 Tested-by: Platform Bot <platform-bot@eclipse.org> Reviewed-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java index 3c4a834..21e307e 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java
@@ -349,6 +349,8 @@ } protected void showAssist(final int showStyle) { + if (fContentAssistSubjectControlAdapter == null) + return; final Control control= fContentAssistSubjectControlAdapter.getControl(); if (control == null) return;