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

Make AddToRequirementsFix idempotent (PY-27596)

Browse Source 
Also update list literal to not add comma after adding element to a tail
This commit is contained in:
Semyon Proshev
2018-03-16 21:45:22 +03:00
parent e328c3dcd1
commit f0cd488478
2 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/inspections/PyPackageRequirementsInspection.java
+39 -16
View File
@@ -164,7 +164,12 @@ public class PyPackageRequirementsInspection extends PyInspection {
final Module module = ModuleUtilCore.findModuleForPsiElement(packageReferenceExpression);
if (module == null) return;
final Collection<PyRequirement> requirements = getRequirementsInclTransitive(module);
final Sdk sdk = PythonSdkType.findPythonSdk(module);
if (sdk == null) return;
final PyPackageManager packageManager = PyPackageManager.getInstance(sdk);
final Collection<PyRequirement> requirements = getRequirementsInclTransitive(packageManager, module);
if (requirements == null) return;
for (PyRequirement req : requirements) {
@@ -209,7 +214,7 @@ public class PyPackageRequirementsInspection extends PyInspection {
.of(packageName)
.append(possiblePyPIPackageNames)
.filter(PyPIPackageUtil.INSTANCE::isInPyPI)
.map(name -> new AddToRequirementsFix(module, name, LanguageLevel.forElement(importedExpression)))
.map(name -> new AddToRequirementsFix(packageManager, module, name, LanguageLevel.forElement(importedExpression)))
.forEach(quickFixes::add);
quickFixes.add(new IgnoreRequirementFix(Collections.singleton(packageName)));
@@ -224,13 +229,8 @@ public class PyPackageRequirementsInspection extends PyInspection {
}
@Nullable
private static Set<PyRequirement> getRequirementsInclTransitive(@NotNull Module module) {
final Sdk sdk = PythonSdkType.findPythonSdk(module);
if (sdk == null) return null;
final PyPackageManager packageManager = PyPackageManager.getInstance(sdk);
final List<PyRequirement> requirements = getListedRequirements(module, packageManager);
private static Set<PyRequirement> getRequirementsInclTransitive(@NotNull PyPackageManager packageManager, @NotNull Module module) {
final List<PyRequirement> requirements = getListedRequirements(packageManager, module);
if (requirements == null) return null;
if (requirements.isEmpty()) return Collections.emptySet();
@@ -243,7 +243,7 @@ public class PyPackageRequirementsInspection extends PyInspection {
}
@Nullable
private static List<PyRequirement> getListedRequirements(@NotNull Module module, @NotNull PyPackageManager packageManager) {
private static List<PyRequirement> getListedRequirements(@NotNull PyPackageManager packageManager, @NotNull Module module) {
final List<PyRequirement> requirements = packageManager.getRequirements(module);
final List<PyRequirement> extrasRequirements = getExtrasRequirements(module);
if (requirements == null) return extrasRequirements;
@@ -549,11 +549,24 @@ public class PyPackageRequirementsInspection extends PyInspection {
}
private static class AddToRequirementsFix implements LocalQuickFix {
@NotNull private final Module myModule;
@NotNull private final String myPackageName;
@NotNull private final LanguageLevel myLanguageLevel;
private AddToRequirementsFix(@NotNull Module module, @NotNull String packageName, @NotNull LanguageLevel languageLevel) {
@NotNull
private final PyPackageManager myPackageManager;
@NotNull
private final Module myModule;
@NotNull
private final String myPackageName;
@NotNull
private final LanguageLevel myLanguageLevel;
private AddToRequirementsFix(@NotNull PyPackageManager packageManager,
@NotNull Module module,
@NotNull String packageName,
@NotNull LanguageLevel languageLevel) {
myPackageManager = packageManager;
myModule = module;
myPackageName = packageName;
myLanguageLevel = languageLevel;
@@ -571,8 +584,18 @@ public class PyPackageRequirementsInspection extends PyInspection {
}
@Override
public void applyFix(@NotNull final Project project, @NotNull ProblemDescriptor descriptor) {
CommandProcessor.getInstance().executeCommand(project, () -> ApplicationManager.getApplication().runWriteAction(() -> PyPackageUtil.addRequirementToTxtOrSetupPy(myModule, myPackageName, myLanguageLevel)), getName(), null);
public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
final List<PyRequirement> requirements = myPackageManager.getRequirements(myModule);
if (requirements != null && ContainerUtil.exists(requirements, r -> r.getName().equals(myPackageName))) return;
CommandProcessor.getInstance().executeCommand(
project,
() -> ApplicationManager.getApplication().runWriteAction(
() -> PyPackageUtil.addRequirementToTxtOrSetupPy(myModule, myPackageName, myLanguageLevel)
),
getName(),
null
);
}
@NotNull
python/src/com/jetbrains/python/psi/impl/PyListLiteralExpressionImpl.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class PyListLiteralExpressionImpl extends PySequenceExpressionImpl implem
PyExpression element = (PyExpression)psiElement;
PyExpression[] els = getElements();
PyExpression lastArg = els.length == 0 ? null : els[els.length - 1];
return PyElementGenerator.getInstance(getProject()).insertItemIntoList(this, lastArg, element);
return PyElementGenerator.getInstance(getProject()).insertItemIntoListRemoveRedundantCommas(this, lastArg, element);
}
private static void checkPyExpression(PsiElement psiElement) throws IncorrectOperationException {