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-8415 Cleanup: camel case, descriptive variable names, fix warnings

Browse Source
This commit is contained in:
Mikhail Golubev
2018-12-06 18:37:08 +03:00
parent d7a7e0770e
commit 3c0efabc22
1 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/refactoring/classes/extractSuperclass/PyExtractSuperclassHelper.java
+39 -41
View File
@@ -206,59 +206,57 @@ public final class PyExtractSuperclassHelper {
*/
@Nullable
private static PsiDirectory createDirectories(Project project, String target) throws IOException {
String the_rest = null;
VirtualFile the_root = null;
PsiDirectory ret = null;
String relativePath = null;
VirtualFile closestRoot = null;
// NOTE: we don't canonicalize target; must be ok in reasonable cases, and is far easier in unit test mode
target = FileUtil.toSystemIndependentName(target);
for (VirtualFile file : ProjectRootManager.getInstance(project).getContentRoots()) {
final String root_path = file.getPath();
if (target.startsWith(root_path)) {
the_rest = target.substring(root_path.length());
the_root = file;
final String rootPath = file.getPath();
if (target.startsWith(rootPath)) {
relativePath = target.substring(rootPath.length());
closestRoot = file;
break;
}
}
if (the_root == null) {
if (closestRoot == null) {
throw new IOException("Can't find '" + target + "' among roots");
}
if (the_rest != null) {
final LocalFileSystem lfs = LocalFileSystem.getInstance();
final PsiManager psi_mgr = PsiManager.getInstance(project);
String[] dirs = the_rest.split("/");
int i = 0;
if ("".equals(dirs[0])) i = 1;
while (i < dirs.length) {
VirtualFile subdir = the_root.findChild(dirs[i]);
if (subdir != null) {
if (!subdir.isDirectory()) {
throw new IOException("Expected dir, but got non-dir: " + subdir.getPath());
}
final LocalFileSystem lfs = LocalFileSystem.getInstance();
final PsiManager psiManager = PsiManager.getInstance(project);
final String[] dirs = relativePath.split("/");
int i = 0;
if (dirs[0].isEmpty()) i = 1;
VirtualFile resultDir = closestRoot;
while (i < dirs.length) {
VirtualFile subdir = resultDir.findChild(dirs[i]);
if (subdir != null) {
if (!subdir.isDirectory()) {
throw new IOException("Expected resultDir, but got non-resultDir: " + subdir.getPath());
}
else {
subdir = the_root.createChildDirectory(lfs, dirs[i]);
}
VirtualFile init_vfile = subdir.findChild(PyNames.INIT_DOT_PY);
if (init_vfile == null) init_vfile = subdir.createChildData(lfs, PyNames.INIT_DOT_PY);
/*
// here we could add an __all__ clause to the __init__.py.
// * there's no point to do so; we import the class directly;
// * we can't do this consistently since __init__.py may already exist and be nontrivial.
if (i == dirs.length - 1) {
PsiFile init_file = psi_mgr.findFile(init_vfile);
LOG.assertTrue(init_file != null);
final PyElementGenerator gen = PyElementGenerator.getInstance(project);
final PyStatement statement = gen.createFromText(LanguageLevel.getDefault(), PyStatement.class, PyNames.ALL + " = [\"" + lastName + "\"]");
init_file.add(statement);
}
*/
the_root = subdir;
i += 1;
}
ret = psi_mgr.findDirectory(the_root);
else {
subdir = resultDir.createChildDirectory(lfs, dirs[i]);
}
if (subdir.findChild(PyNames.INIT_DOT_PY) == null) {
subdir.createChildData(lfs, PyNames.INIT_DOT_PY);
}
/*
// here we could add an __all__ clause to the __init__.py.
// * there's no point to do so; we import the class directly;
// * we can't do this consistently since __init__.py may already exist and be nontrivial.
if (i == dirs.length - 1) {
PsiFile init_file = psiManager.findFile(initVFile);
LOG.assertTrue(init_file != null);
final PyElementGenerator gen = PyElementGenerator.getInstance(project);
final PyStatement statement = gen.createFromText(LanguageLevel.getDefault(), PyStatement.class, PyNames.ALL + " = [\"" + lastName + "\"]");
init_file.add(statement);
}
*/
resultDir = subdir;
i += 1;
}
return ret;
return psiManager.findDirectory(resultDir);
}
public static String getRefactoringId() {