mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-10 12:03:16 +02:00
Code Issues Wiki Activity

Bug 447622: Display better message when information is missing

Browse source 
Change-Id: I9c908c53e88311fbdd067a1fbfe61de62ef04ae0
This commit is contained in:
Jonah Graham 2019-12-30 16:38:01 -05:00
parent 6da6e91cc1
commit caaeb7489d
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractAnnotationHover.java
View file

@ -320,7 +320,14 @@ public class AbstractAnnotationHover extends AbstractCEditorTextHover {
StyledText text = new StyledText(composite, SWT.MULTI | SWT.WRAP | SWT.READ_ONLY);
GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
text.setLayoutData(data);
text.setText(annotation.getText());
String annotationText = annotation.getText();
if (annotationText == null) {
// This shouldn't happen, but it really does sometimes. See Bug 447622
// Therefore we have to provide a sensible fallback
text.setText(CHoverMessages.AbstractAnnotationHover_annotation_text_null_message);
} else {
text.setText(annotationText);
}
}
private void createCompletionProposalsControl(Composite parent, ICompletionProposal[] proposals) {

1
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CHoverMessages.java
View file

@ -20,6 +20,7 @@ import org.eclipse.osgi.util.NLS;
public final class CHoverMessages extends NLS {
public static String AbstractAnnotationHover_action_configureAnnotationPreferences;
public static String AbstractAnnotationHover_annotation_text_null_message;
public static String AbstractAnnotationHover_message_singleQuickFix;
public static String AbstractAnnotationHover_message_multipleQuickFix;

1
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CHoverMessages.properties
View file

@ -14,6 +14,7 @@
# Sergey Prigogin (Google)
###############################################################################
AbstractAnnotationHover_action_configureAnnotationPreferences= Configure Annotation Preferences
AbstractAnnotationHover_annotation_text_null_message=Additional information is not available for this annotation.
AbstractAnnotationHover_message_singleQuickFix= 1 quick fix available:
AbstractAnnotationHover_message_multipleQuickFix= {0} quick fixes available: