From ff783be167fa4fad7ba25961c3de9ec197e9c7d3 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Tue, 9 Dec 2008 13:59:49 +0000
Subject: [PATCH] Plain C: search for locals, bug 151334.

---
 .../internal/core/dom/parser/c/CASTCompoundStatement.java    | 2 +-
 .../cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatement.java
index a67052a3d27..38a774a83be 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatement.java
@@ -46,7 +46,7 @@ public class CASTCompoundStatement extends ASTNode implements IASTCompoundStatem
 
     public IScope getScope() {
         if( scope == null )
-            scope = new CScope( this, EScopeKind.eClassType);
+            scope = new CScope(this, EScopeKind.eLocal);
         return scope;
     }
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java
index 2beb79188d5..9faba435528 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/PDOMSearchTextSelectionQuery.java
@@ -18,13 +18,12 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.text.ITextSelection;
 
 import org.eclipse.cdt.core.dom.ast.DOMException;
+import org.eclipse.cdt.core.dom.ast.EScopeKind;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
 import org.eclipse.cdt.core.dom.ast.IBinding;
 import org.eclipse.cdt.core.dom.ast.IProblemBinding;
 import org.eclipse.cdt.core.dom.ast.IScope;
-import org.eclipse.cdt.core.dom.ast.c.ICFunctionScope;
-import org.eclipse.cdt.core.dom.ast.cpp.ICPPBlockScope;
 import org.eclipse.cdt.core.index.IIndex;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ILanguage;
@@ -66,7 +65,7 @@ public class PDOMSearchTextSelectionQuery extends PDOMSearchQuery {
 									scope = binding.getScope();
 								} catch (DOMException e) {
 								}
-								if (scope instanceof ICPPBlockScope || scope instanceof ICFunctionScope) {
+								if (scope != null && scope.getKind() == EScopeKind.eLocal) {
 									createLocalMatches(ast, binding);
 									return Status.OK_STATUS;
 								}