MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-80465 : Errors reported for correct XSLT (needToPreventRecursion seems to cause sporadic resolve problems - and isn't actually required here)

Browse Source
This commit is contained in:
sweinreuter
2012-02-09 17:18:59 +01:00
parent 41d48cad81
commit dee964cfdb
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltVariableContext.java
+4 -6
View File
@@ -17,7 +17,6 @@ package org.intellij.lang.xpath.xslt.context;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiManager;
import com.intellij.psi.PsiReference;
import com.intellij.psi.impl.source.resolve.ResolveCache;
import com.intellij.psi.util.PsiTreeUtil;
@@ -66,14 +65,13 @@ public class XsltVariableContext implements VariableContext<XsltVariable> {
}
public XPathVariable resolve(final XPathVariableReference reference) {
final PsiManager mgr = reference.getManager();
return (XPathVariable) ResolveCache.getInstance(mgr.getProject()).resolveWithCaching(reference, RESOLVER, true, false);
return (XPathVariable) ResolveCache.getInstance(reference.getProject()).resolveWithCaching(reference, RESOLVER, false, false);
}
@Nullable
private XPathVariable resolveInner(XPathVariableReference reference) {
final XmlTag context = getContextTagImpl(reference);
final ResolveProcessor processor = new ResolveProcessor(reference.getReferencedName(), context);
final VariableResolveProcessor processor = new VariableResolveProcessor(reference.getReferencedName(), context);
final XPathVariable variable = (XPathVariable)ResolveUtil.treeWalkUp(processor, context);
if (variable != null) {
@@ -181,11 +179,11 @@ public class XsltVariableContext implements VariableContext<XsltVariable> {
}
}
static class ResolveProcessor extends VariableProcessor implements ResolveUtil.ResolveProcessor {
static class VariableResolveProcessor extends VariableProcessor implements ResolveUtil.ResolveProcessor {
private final String myName;
private PsiElement myResult = null;
public ResolveProcessor(final String name, XmlTag context) {
public VariableResolveProcessor(final String name, XmlTag context) {
super(context);
myName = name;
}