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

PY-13140 Fix several minor issues found during code review

Browse Source
This commit is contained in:
Mikhail Golubev
2014-07-10 18:26:37 +04:00
parent 99058ce9a0
commit 3674c5e773
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/PyStarImportElementImpl.java
+1 -4
View File
@@ -52,9 +52,7 @@ public class PyStarImportElementImpl extends PyElementImpl implements PyStarImpo
for (PsiElement importedFile : new HashSet<PsiElement>(importedFiles)) { // resolver gives lots of duplicates
final PsiElement source = PyUtil.turnDirIntoInit(importedFile);
if (source instanceof PyFile) {
// PY-13140
Iterable<PyElement> declaredNames = ((PyFile)source).iterateNames();
// Filter out names starting with underscore only if __all__ attribute is not defined in the module
if (((PyFile)source).getDunderAll() == null) {
declaredNames = excludeUnderscoredNames(declaredNames);
}
@@ -70,7 +68,7 @@ public class PyStarImportElementImpl extends PyElementImpl implements PyStarImpo
return Iterables.filter(declaredNames, new Predicate<PyElement>() {
@Override
public boolean apply(@Nullable PyElement input) {
String name = input != null ? input.getName() : null;
final String name = input != null ? input.getName() : null;
if (name != null && name.startsWith("_")) {
return false;
}
@@ -97,7 +95,6 @@ public class PyStarImportElementImpl extends PyElementImpl implements PyStarImpo
final PsiElement result = results != null && !results.isEmpty() ? results.get(0).getElement() : null;
if (result != null) {
final List<String> all = sourceFile.getDunderAll();
// PY-13140
if (all != null ? !all.contains(name) : name.startsWith("_")) {
continue;
}
python/testSrc/com/jetbrains/python/PythonCompletionTest.java
-1
View File
@@ -618,7 +618,6 @@ public class PythonCompletionTest extends PyTestCase {
// PY-13140
public void testModulePrivateNamesCompletedInsideImport() {
//doMultiFileTest();
myFixture.copyDirectoryToProject("completion/" + getTestName(true), "");
myFixture.configureByFile("a.py");
myFixture.completeBasic();
python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
+1
View File
@@ -366,6 +366,7 @@ public class PyUnresolvedReferencesInspectionTest extends PyInspectionTestCase {
doMultiFileTest();
}
// PY-13140
public void testPrivateModuleNames() {
doMultiFileTest();
}