aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzzhongwei2013-03-24 11:30:49 (EDT)
committerzzhongwei2013-03-24 11:32:04 (EDT)
commit001f5cc49de044c3d15851ea793e6c0d59cdeaf1 (patch)
tree87037347f1d1446bc3a5a1d9858ae361b435f290
parent4575049e3e6342d107bb3c962df291b8ddca8f1f (diff)
downloadorg.eclipse.pdt-001f5cc49de044c3d15851ea793e6c0d59cdeaf1.zip
org.eclipse.pdt-001f5cc49de044c3d15851ea793e6c0d59cdeaf1.tar.gz
org.eclipse.pdt-001f5cc49de044c3d15851ea793e6c0d59cdeaf1.tar.bz2
401324: Ctrl+click on a static variable called with self:: resolves
wrong https://bugs.eclipse.org/bugs/show_bug.cgi?id=401324
-rw-r--r--plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/codeassist/PHPSelectionEngine.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/codeassist/PHPSelectionEngine.java b/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/codeassist/PHPSelectionEngine.java
index e5c8a2a..927c88c 100644
--- a/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/codeassist/PHPSelectionEngine.java
+++ b/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/codeassist/PHPSelectionEngine.java
@@ -16,6 +16,7 @@ import java.util.*;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.dltk.ast.ASTNode;
import org.eclipse.dltk.ast.Modifiers;
import org.eclipse.dltk.ast.declarations.Declaration;
@@ -425,12 +426,13 @@ public class PHPSelectionEngine extends ScriptSelectionEngine {
if (element instanceof IType) {
IType type = (IType) element;
try {
- fields.addAll(Arrays
- .asList(PHPModelUtils
- .getTypeField(type,
- fieldName,
- true)));
- } catch (ModelException e) {
+ fields.addAll(Arrays.asList(PHPModelUtils
+ .getTypeHierarchyField(
+ type,
+ fieldName,
+ true,
+ new NullProgressMonitor())));
+ } catch (Exception e) {
PHPCorePlugin.log(e);
}
}