fix

Author: jxnu-liguobin

build.sbt

@@ -65,8 +65,9 @@ lazy val `sbt-dependency-analyzer` = (project in file("."))
       offline = true,                  // forbid the verifier from reaching the internet
       failureLevels = Set(FailureLevel.COMPATIBILITY_PROBLEMS, FailureLevel.COMPATIBILITY_WARNINGS)
     ),
-    autoRemoveOldCachedIntelliJSDK := true,
-    Global / intellijAttachSources := true,
+    ThisBuild / bundleScalaLibrary             := true,
+    ThisBuild / autoRemoveOldCachedIntelliJSDK := true,
+    Global / intellijAttachSources             := true,
     intellijPlugins ++= Seq("com.intellij.java", "com.intellij.java-i18n", "org.intellij.scala").map(_.toPlugin),
     Compile / unmanagedResourceDirectories += baseDirectory.value / "src" / "main" / "resources",
     Test / unmanagedResourceDirectories += baseDirectory.value / "src" / "test" / "resources",
@@ -87,7 +88,10 @@ lazy val `sbt-dependency-analyzer` = (project in file("."))
     kotlinVersion := ktVersion,
     Compile / unmanagedSourceDirectories += baseDirectory.value / "src" / "main" / "kotlin",
     packageLibraryMappings ++= Seq(
-      "org.jetbrains.kotlin" % ".*" % ".*" -> None,
-      "org.jetbrains"        % ".*" % ".*" -> None
+      "org.jetbrains.kotlin"   % ".*"        % ".*" -> None,
+      "org.jetbrains"          % ".*"        % ".*" -> None,
+      "org.scala-lang"         % "scala-.*"  % ".*" -> None,
+      "org.scala-lang"         % "scala3-.*" % ".*" -> None,
+      "org.scala-lang.modules" % "scala-.*"  % ".*" -> None
     )
   )

src/main/scala/bitlap/sbt/analyzer/action/SbtDependencyAnalyzerActionUtil.scala

@@ -21,6 +21,21 @@ final case class ModifiableDependency(
 
 object SbtDependencyAnalyzerActionUtil {
 
+  private def isScalaArtifact(coordinates: UnifiedCoordinates): Boolean = {
+    coordinates.getArtifactId.endsWith("_3") || coordinates.getArtifactId.endsWith("_2.13") ||
+    coordinates.getArtifactId.endsWith("_2.12") || coordinates.getArtifactId.endsWith("_2.11")
+  }
+
+  private def getArtifactWithoutScalaVersion(coordinates: UnifiedCoordinates) = {
+    val artifactName = coordinates.getArtifactId
+      .stripSuffix("_3")
+      .stripSuffix("_2.13")
+      .stripSuffix("_2.12")
+      .stripSuffix("_2.11")
+
+    artifactName
+  }
+
   def getModifiableDependency(e: AnActionEvent): ModifiableDependency =
     val project    = e.getProject
     val dependency = e.getData(DependencyAnalyzerView.Companion.getDEPENDENCY)
@@ -34,22 +49,18 @@ object SbtDependencyAnalyzerActionUtil {
 
     val candidateDeclaredDependencies = DependencyUtils
       .getDeclaredDependency(module)
-    val declared = candidateDeclaredDependencies.find(dc =>
+    val declaredDependency = candidateDeclaredDependencies.find(dc =>
       // hard code, see SbtDependencyUtils#getLibraryDependenciesOrPlacesFromPsi
       val artifactName =
-        if (
-          coordinates.getArtifactId.endsWith("_3") || coordinates.getArtifactId.endsWith("_2.13") ||
-          coordinates.getArtifactId.endsWith("_2.12") || coordinates.getArtifactId.endsWith("_2.11")
-        ) coordinates.getArtifactId.split('_').head
-        else coordinates.getArtifactId
+        if (isScalaArtifact(coordinates)) getArtifactWithoutScalaVersion(coordinates) else coordinates.getArtifactId
       (dc.getCoordinates.getArtifactId == coordinates.getArtifactId ||
-        dc.getCoordinates.getArtifactId == artifactName ||
+        getArtifactWithoutScalaVersion(dc.getCoordinates) == artifactName ||
         // maybe a fixed artifact
         dc.getCoordinates.getVersion == artifactName) &&
         dc.getCoordinates.getGroupId == coordinates.getGroupId
     )
 
-    ModifiableDependency(module, coordinates, declared, candidateDeclaredDependencies, parentDependency)
+    ModifiableDependency(module, coordinates, declaredDependency, candidateDeclaredDependencies, parentDependency)
   end getModifiableDependency
 
 }

src/main/scala/bitlap/sbt/analyzer/util/packagesearch/SbtDependencyModifier.scala

@@ -148,6 +148,7 @@ object SbtDependencyModifier extends ExternalDependencyModificator {
     if (targetedLibDepTuple == null) {
       throw AnalyzerCommandNotFoundException("Target dependency not found")
     }
+    // dangerous, hard-coded
     targetedLibDepTuple._3.getParent match {
       case _: ScArgumentExprList =>
         inWriteCommandAction {
@@ -157,13 +158,17 @@ object SbtDependencyModifier extends ExternalDependencyModificator {
         inWriteCommandAction {
           infix.delete()
         }
+      case infix: ScInfixExpr if infix.getChildren.length == 3 && infix.getChildren()(2).isInstanceOf[ScUnitExpr] =>
+        inWriteCommandAction {
+          infix.delete()
+        }
       case infix: ScParenthesisedExpr if infix.parents.toList.exists(_.isInstanceOf[ScReferenceExpression]) =>
         val lastRef = infix.parents.toList.filter(_.isInstanceOf[ScReferenceExpression]).lastOption
         inWriteCommandAction {
           lastRef.foreach(_.parent.foreach(_.delete()))
         }
       case _ =>
-        throw AnalyzerCommandNotFoundException("Target parent not found")
+        throw AnalyzerCommandNotFoundException("This syntax is not supported at this time")
     }
   }