From 2cdd5df34709926d1387314fe596913ec2d473bf Mon Sep 17 00:00:00 2001 From: Markus Schorn Date: Tue, 11 May 2010 13:28:47 +0000 Subject: [PATCH] Bug 312399: NPE using F3 on undef. --- .../selection/CPPSelectionTestsAnyIndexer.java | 18 ++++++++++++++++++ .../ui/search/actions/OpenDeclarationsJob.java | 13 ++++++++----- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsAnyIndexer.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsAnyIndexer.java index e244d6542e5..384cbff3c4c 100644 --- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsAnyIndexer.java +++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/selection/CPPSelectionTestsAnyIndexer.java @@ -1229,4 +1229,22 @@ public abstract class CPPSelectionTestsAnyIndexer extends BaseSelectionTestsInde assertEquals("ambiguous input: 2", e.getMessage()); } } + + // #define MYMACRO + + // #undef MYMACRO + public void testUndef_312399() throws Exception { + StringBuffer[] buffers= getContents(2); + String hcode= buffers[0].toString(); + String scode= buffers[1].toString(); + IFile hfile = importFile("testUndef_312399.h", hcode); + IFile file = importFile("testUndef_312399.cpp", scode); + waitUntilFileIsIndexed(index, file, MAX_WAIT_TIME); + + IASTNode target = testF3(file, scode.indexOf("MYMACRO")); + assertTrue(target instanceof IASTName); + assertEquals("MYMACRO", ((IASTName) target).toString()); + assertEquals(hcode.indexOf("MYMACRO"), target.getFileLocation().getNodeOffset()); + assertEquals("MYMACRO".length(), ((ASTNode) target).getLength()); + } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java index ae472106002..bcc76132753 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsJob.java @@ -677,11 +677,14 @@ class OpenDeclarationsJob extends Job implements ASTRunnable { String[] sourceQualifiedName= null; int funcArgCount= -1; if (sourceName != null) { - sourceQualifiedName= CPPVisitor.getQualifiedName(sourceName.resolveBinding()); - if (sourceName.resolveBinding() instanceof ICPPUnknownBinding) { - LookupData data= CPPSemantics.createLookupData(sourceName, false); - if (data.isFunctionCall()) { - funcArgCount= data.getFunctionArgumentCount(); + final IBinding binding = sourceName.resolveBinding(); + if (binding != null) { + sourceQualifiedName= CPPVisitor.getQualifiedName(binding); + if (binding instanceof ICPPUnknownBinding) { + LookupData data= CPPSemantics.createLookupData(sourceName, false); + if (data.isFunctionCall()) { + funcArgCount= data.getFunctionArgumentCount(); + } } } }