From 94a68d1f4e1266bd7c0aafa9a227ed559dcd4d37 Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Tue, 17 Apr 2007 13:23:50 +0000 Subject: [PATCH] Make the open decl on includes a little safer. --- .../cdt/internal/ui/search/actions/OpenDeclarationsAction.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java index fb176dcb7d6..8808d0e112a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/OpenDeclarationsAction.java @@ -127,7 +127,8 @@ public class OpenDeclarationsAction extends SelectionParseAction { if (!(preprocs[i] instanceof IASTPreprocessorIncludeStatement)) continue; IASTFileLocation loc = preprocs[i].getFileLocation(); - if (loc.getFileName().equals(ast.getFilePath()) + if (loc != null + && loc.getFileName().equals(ast.getFilePath()) && loc.getNodeOffset() < selectionStart && loc.getNodeOffset() + loc.getNodeLength() > selectionStart) { // Got it