diff options
author | Jonah Graham | 2017-04-19 10:26:12 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2017-04-20 08:17:08 +0000 |
commit | 4a7088a1c1b19ea8284c8384305049d821438ed6 (patch) | |
tree | 33cd7994f007bee85e7ade6fdafe1d775d5855d2 /core/org.eclipse.cdt.ui | |
parent | 39fceeb18b5fc3bef8fb44cf495f065127652480 (diff) | |
download | org.eclipse.cdt-4a7088a1c1b19ea8284c8384305049d821438ed6.tar.gz org.eclipse.cdt-4a7088a1c1b19ea8284c8384305049d821438ed6.tar.xz org.eclipse.cdt-4a7088a1c1b19ea8284c8384305049d821438ed6.zip |
Bug 515430: Prevent assertion by checking for quick fixable set
Change-Id: Iea8ac8354b104cb272457b78d2bf1304bd69e065
Diffstat (limited to 'core/org.eclipse.cdt.ui')
-rw-r--r-- | core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java index b235b1b1744..afefc1a5972 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CDocumentProvider.java @@ -546,7 +546,8 @@ public class CDocumentProvider extends TextFileDocumentProvider { private void setOverlay(Object value, ProblemAnnotation problemAnnotation) { if (value instanceof CMarkerAnnotation) { CMarkerAnnotation annotation= (CMarkerAnnotation) value; - if (annotation.isProblem() && !annotation.isQuickFixable()) { + if (annotation.isProblem() + && (!annotation.isQuickFixableStateSet() || !annotation.isQuickFixable())) { annotation.setOverlay(problemAnnotation); fPreviouslyOverlaid.remove(annotation); fCurrentlyOverlaid.add(annotation); |