mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

NPE in macro explorer, bug 23540.

Browse source
This commit is contained in:
Markus Schorn 2008-01-17 16:40:56 +00:00
parent 2bf1905d6c
commit 4e7239b927
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner/ExpansionExplorerTests.java
View file

@ -281,4 +281,17 @@ public class ExpansionExplorerTests extends BaseTestCase {
performTest(5); performTest(5);
} }
// #define str(x) #x
// #define xstr(x) str(x)
// xstr(__LINE__)
// xstr(1)
// str(1)
// "1"
public void testStringify() throws Exception {
performTest(3);
}
} }

16
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionExplorationControl.java
View file

@ -40,6 +40,7 @@ import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.text.edits.ReplaceEdit;
import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.PlatformUI; import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.contexts.IContextActivation; import org.eclipse.ui.contexts.IContextActivation;
@ -48,6 +49,7 @@ import org.eclipse.ui.handlers.IHandlerService;
import org.eclipse.ui.keys.IBindingService; import org.eclipse.ui.keys.IBindingService;
import org.eclipse.cdt.core.dom.ast.IMacroBinding; import org.eclipse.cdt.core.dom.ast.IMacroBinding;
import org.eclipse.cdt.core.dom.rewrite.MacroExpansionExplorer.IMacroExpansionStep;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.PreferenceConstants;
import org.eclipse.cdt.ui.text.ICPartitions; import org.eclipse.cdt.ui.text.ICPartitions;
@ -331,7 +333,8 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo
private String getMacroText(int index) { private String getMacroText(int index) {
final String text; final String text;
if (index < fInput.fExplorer.getExpansionStepCount()) { if (index < fInput.fExplorer.getExpansionStepCount()) {
IMacroBinding binding= fInput.fExplorer.getExpansionStep(index).getExpandedMacro(); final IMacroExpansionStep expansionStep= fInput.fExplorer.getExpansionStep(index);
IMacroBinding binding= expansionStep.getExpandedMacro();
StringBuffer buffer= new StringBuffer(); StringBuffer buffer= new StringBuffer();
buffer.append("#define ").append(binding.getName()); //$NON-NLS-1$ buffer.append("#define ").append(binding.getName()); //$NON-NLS-1$
char[][] params= binding.getParameterList(); char[][] params= binding.getParameterList();
@ -348,7 +351,16 @@ public class CMacroExpansionExplorationControl extends AbstractCompareViewerInfo
buffer.append(')'); buffer.append(')');
} }
buffer.append(' '); buffer.append(' ');
buffer.append(binding.getExpansionImage()); final char[] expansionImage = binding.getExpansionImage();
if (expansionImage != null) {
buffer.append(expansionImage);
}
else {
ReplaceEdit[] replacements= expansionStep.getReplacements();
if (replacements.length == 1) {
buffer.append(replacements[0].getText());
}
}
text= buffer.toString(); text= buffer.toString();
} else { } else {
text= ""; //$NON-NLS-1$ text= ""; //$NON-NLS-1$