mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Patch for Devin Steffler.

Browse source 
Fixed 104090 	[Parser] NPE in Parser.provideSelectionNode when running JUnit AIS
This commit is contained in:
John Camelon 2005-07-18 23:30:13 +00:00
parent b2a6149858
commit 1897a34ffb
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/SelectionRegressionTest.java
View file

@ -71,7 +71,7 @@ public class SelectionRegressionTest extends BaseTestFramework {
suite.addTest( new SelectionRegressionTest( "testMethod" ) ); //$NON-NLS-1$
suite.addTest( new FailingTest( new SelectionRegressionTest( "testMethodRHS78656" ), 78656 )); //$NON-NLS-1$
suite.addTest( new FailingTest( new SelectionRegressionTest( "testMethod78114" ), 78114 )); //$NON-NLS-1$
suite.addTest( new FailingTest( new SelectionRegressionTest( "testMethod78118" ), 78118 )); //$NON-NLS-1$
suite.addTest( new SelectionRegressionTest( "testMethod78118" ) ); //$NON-NLS-1$
suite.addTest( new FailingTest( new SelectionRegressionTest( "testOverloadedMethod78389" ), 78389 )); //$NON-NLS-1$
suite.addTest( new FailingTest( new SelectionRegressionTest( "testConstructor78625" ), 78625) ); //$NON-NLS-1$
suite.addTest( new SelectionRegressionTest( "testClassField" ) ); //$NON-NLS-1$

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/Parser.java
View file

@ -6648,7 +6648,7 @@ public class Parser implements IParserData, IParser
// duple is prefix of greaterContextDuple
// or duple is suffix of greaterContextDuple
// duple is a sub-duple of greaterContextDuple
if( duple.getFirstToken().equals( greaterContextDuple.getFirstToken() ))
if( greaterContextDuple == null || duple.getFirstToken().equals( greaterContextDuple.getFirstToken() ))
finalDuple = duple; // => do not use greaterContextDuple
else if( duple.getLastSegment().getFirstToken().equals( greaterContextDuple.getLastSegment().getFirstToken() ))
finalDuple = greaterContextDuple; // => use greaterContextDuple