From b103bbf69c9b7fa35fb512d7d733aa6a3ec4616b Mon Sep 17 00:00:00 2001
From: Lamberto Basti <lamberto.basti@jetbrains.com>
Date: Wed, 12 Jan 2022 17:44:17 +0100
Subject: [PATCH] fixing PKGS-898

GitOrigin-RevId: 38804277269b68dc822120950141892eb96823fc
---
 .../AbstractProjectModuleOperationProvider.kt        |  6 +++---
 .../maven/MavenProjectModuleOperationProvider.kt     | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/AbstractProjectModuleOperationProvider.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/AbstractProjectModuleOperationProvider.kt
index 78ad7c5f2875..37846bb9faea 100644
--- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/AbstractProjectModuleOperationProvider.kt
+++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/extensibility/AbstractProjectModuleOperationProvider.kt
@@ -84,14 +84,14 @@ abstract class AbstractProjectModuleOperationProvider : ProjectModuleOperationPr
             operationMetadata.newScope ?: operationMetadata.currentScope
         )
 
-        try {
+        return try {
             runWriteAction {
                 DependencyModifierService.getInstance(module.nativeModule.project)
                     .updateDependency(operationMetadata.module.nativeModule, oldDependency, newDependency)
             }
-            return emptyList()
+            emptyList()
         } catch (e: Exception) {
-            return listOf(OperationFailure(OperationType.REMOVE, oldDependency, e))
+            listOf(OperationFailure(OperationType.REMOVE, oldDependency, e))
         }
     }
 
diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/maven/MavenProjectModuleOperationProvider.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/maven/MavenProjectModuleOperationProvider.kt
index 780d70708671..d365292cfec3 100644
--- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/maven/MavenProjectModuleOperationProvider.kt
+++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/maven/MavenProjectModuleOperationProvider.kt
@@ -4,8 +4,10 @@ import com.intellij.buildsystem.model.unified.UnifiedDependencyRepository
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
 import com.jetbrains.packagesearch.intellij.plugin.extensibility.AbstractProjectModuleOperationProvider
+import com.jetbrains.packagesearch.intellij.plugin.extensibility.DependencyOperationMetadata
 import com.jetbrains.packagesearch.intellij.plugin.extensibility.ProjectModule
 import com.jetbrains.packagesearch.intellij.plugin.extensibility.ProjectModuleType
+import com.jetbrains.packagesearch.intellij.plugin.maven.configuration.PackageSearchMavenConfiguration
 import org.jetbrains.idea.maven.utils.MavenUtil
 
 private val MAVEN_CENTRAL_UNIFIED_REPOSITORY = UnifiedDependencyRepository(
@@ -16,6 +18,16 @@ private val MAVEN_CENTRAL_UNIFIED_REPOSITORY = UnifiedDependencyRepository(
 
 internal class MavenProjectModuleOperationProvider : AbstractProjectModuleOperationProvider() {
 
+    override fun addDependencyToModule(
+        operationMetadata: DependencyOperationMetadata,
+        module: ProjectModule
+    ) = super.addDependencyToModule(
+        operationMetadata = operationMetadata.copy(
+            newScope = operationMetadata.newScope?.takeIf { it != PackageSearchMavenConfiguration.DEFAULT_MAVEN_SCOPE }
+        ),
+        module = module
+    )
+
     override fun usesSharedPackageUpdateInspection() = true
 
     override fun hasSupportFor(projectModuleType: ProjectModuleType): Boolean =