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

Fix for bug 166026 - getContainingFilename wrong for include directives

Browse source
This commit is contained in:
Anton Leherbauer 2006-11-29 15:02:32 +00:00
parent 6f3df88cd1
commit c53849b219
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationInclusionTests.java
View file

@ -226,6 +226,8 @@ public class DOMLocationInclusionTests extends AST2FileBasePluginTest {
assertNotNull(incs); assertNotNull(incs);
assertEquals(incs.length, 1); assertEquals(incs.length, 1);
assertSoleFileLocation(incs[0], filename, code.indexOf("#inc"), "#include \"foo.h\"".length()); assertSoleFileLocation(incs[0], filename, code.indexOf("#inc"), "#include \"foo.h\"".length());
// test bug 166026
assertEquals(tu.getFilePath(), incs[0].getContainingFilename());
checkInclude(incs[0], filename, code, "foo.h", false); checkInclude(incs[0], filename, code, "foo.h", false);
} }

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/LocationMap.java
View file

@ -2596,6 +2596,9 @@ public class LocationMap implements ILocationResolver, IScannerPreprocessorLog {
public String getContainingFilename(int offset) { public String getContainingFilename(int offset) {
_Context c = findContextForOffset(offset); _Context c = findContextForOffset(offset);
if( c == null ) return EMPTY_STRING; if( c == null ) return EMPTY_STRING;
if (c instanceof _Inclusion && c.containsInDirective(offset, 1)) {
c = c.getParent();
}
_CompositeFileContext file = c.getContainingFileContext(); _CompositeFileContext file = c.getContainingFileContext();
if( file == null ) return EMPTY_STRING; if( file == null ) return EMPTY_STRING;
return file.reader.getPath(); return file.reader.getPath();