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

SOE protection in PyFileImpl.getElementNamed()

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-05-06 20:08:50 +04:00
parent 1ac390bf74
commit 29c20bb2cf
1 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/PyFileImpl.java
+28 -15
View File
@@ -39,12 +39,8 @@ import java.util.List;
public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression {
protected PyType myType;
private ThreadLocal<List<String>> myNameResolveStack = new ThreadLocal<List<String>>() {
@Override
protected List<String> initialValue() {
return new ArrayList<String>();
}
};
private ThreadLocal<List<String>> myFindExportedNameStack = new ArrayListThreadLocal();
private ThreadLocal<List<String>> myGetElementNamedStack = new ArrayListThreadLocal();
public PyFileImpl(FileViewProvider viewProvider) {
super(viewProvider, PythonLanguage.getInstance());
@@ -192,7 +188,7 @@ public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression {
}
public PsiElement findExportedName(String name) {
final List<String> stack = myNameResolveStack.get();
final List<String> stack = myFindExportedNameStack.get();
if (stack.contains(name)) {
return null;
}
@@ -271,17 +267,27 @@ public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression {
@Nullable
public PsiElement getElementNamed(String name) {
PsiElement exportedName = findExportedName(name);
if (exportedName == null) {
final PyFile builtins = PyBuiltinCache.getInstance(this).getBuiltinsFile();
if (builtins != null && builtins != this) {
exportedName = builtins.findExportedName(name);
final List<String> stack = myGetElementNamedStack.get();
if (stack.contains(name)) {
return null;
}
stack.add(name);
try {
PsiElement exportedName = findExportedName(name);
if (exportedName == null) {
final PyFile builtins = PyBuiltinCache.getInstance(this).getBuiltinsFile();
if (builtins != null && builtins != this) {
exportedName = builtins.findExportedName(name);
}
}
if (exportedName instanceof PyImportElement) {
return ((PyImportElement) exportedName).getElementNamed(name);
}
return exportedName;
}
if (exportedName instanceof PyImportElement) {
return ((PyImportElement) exportedName).getElementNamed(name);
finally {
stack.remove(name);
}
return exportedName;
}
@NotNull
@@ -406,4 +412,11 @@ public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression {
public PsiElement addAfter(@NotNull PsiElement element, PsiElement anchor) throws IncorrectOperationException {
return super.addAfter(PyPsiUtils.removeIndentation(element), anchor);
}
private static class ArrayListThreadLocal extends ThreadLocal<List<String>> {
@Override
protected List<String> initialValue() {
return new ArrayList<String>();
}
}
}