EDU-479 Renaming variable inside a file with the same name

This commit is contained in:
Liana Bakradze
2016-06-22 14:50:57 +03:00
parent f61ff8e34f
commit 8a93eebe8e
5 changed files with 0 additions and 79 deletions
@@ -28,10 +28,6 @@
<CCLanguageManager implementationClass="com.jetbrains.edu.coursecreator.PyCCLanguageManager" language="Python"/>
</extensions>
<extensions defaultExtensionNs="Pythonid">
<pyReferenceResolveProvider implementation="com.jetbrains.edu.coursecreator.PyCCReferenceResolveProvider"/>
</extensions>
<actions>
<action class="com.jetbrains.edu.coursecreator.PyCCCreateProjectFromArchive" id="PyCC.NewEdu" text="Create New Educational Project">
<add-to-group group-id="CCFileGroup" anchor="last"/>
@@ -1,23 +0,0 @@
package com.jetbrains.edu.coursecreator;
import com.intellij.openapi.project.Project;
import com.jetbrains.python.edu.PyEduUtils;
import com.jetbrains.python.psi.PyQualifiedExpression;
import com.jetbrains.python.psi.resolve.PyReferenceResolveProvider;
import com.jetbrains.python.psi.resolve.RatedResolveResult;
import org.jetbrains.annotations.NotNull;
import java.util.Collections;
import java.util.List;
public class PyCCReferenceResolveProvider implements PyReferenceResolveProvider {
@NotNull
@Override
public List<RatedResolveResult> resolveName(@NotNull final PyQualifiedExpression element) {
Project project = element.getProject();
if (!CCUtils.isCourseCreator(project)) {
return Collections.emptyList();
}
return PyEduUtils.getResolveResultFromContainingDirectory(element);
}
}
@@ -1,30 +0,0 @@
package com.jetbrains.python.edu;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiFile;
import com.jetbrains.python.psi.PyQualifiedExpression;
import com.jetbrains.python.psi.resolve.ImportedResolveResult;
import com.jetbrains.python.psi.resolve.RatedResolveResult;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
public class PyEduUtils {
private PyEduUtils() {
}
public static List<RatedResolveResult> getResolveResultFromContainingDirectory(@NotNull PyQualifiedExpression element) {
final List<RatedResolveResult> result = new ArrayList<RatedResolveResult>();
final PsiFile containingFile = element.getContainingFile();
if (containingFile == null) return result;
final PsiDirectory directory = containingFile.getContainingDirectory();
if (directory == null) return result;
final String elementName = element.getName();
final PsiFile file = directory.findFile(elementName + ".py");
if (file != null) {
result.add(new ImportedResolveResult(file, RatedResolveResult.RATE_NORMAL, null));
}
return result;
}
}
@@ -26,7 +26,6 @@
</extensions>
<extensions defaultExtensionNs="Pythonid">
<inspectionExtension implementation="com.jetbrains.edu.learning.highlighting.PyStudyInspectionExtension"/>
<pyReferenceResolveProvider implementation="com.jetbrains.edu.learning.PyStudyReferenceResolveProvider"/>
<importResolver implementation="com.jetbrains.edu.learning.PyStudyImportResolver"/>
</extensions>
<extensions defaultExtensionNs="Edu">
@@ -1,21 +0,0 @@
package com.jetbrains.edu.learning;
import com.jetbrains.python.edu.PyEduUtils;
import com.jetbrains.python.psi.PyQualifiedExpression;
import com.jetbrains.python.psi.resolve.PyReferenceResolveProvider;
import com.jetbrains.python.psi.resolve.RatedResolveResult;
import org.jetbrains.annotations.NotNull;
import java.util.Collections;
import java.util.List;
public class PyStudyReferenceResolveProvider implements PyReferenceResolveProvider {
@NotNull
@Override
public List<RatedResolveResult> resolveName(@NotNull final PyQualifiedExpression element) {
if (StudyTaskManager.getInstance(element.getProject()).getCourse() == null) {
return Collections.emptyList();
}
return PyEduUtils.getResolveResultFromContainingDirectory(element);
}
}