update

Author: jxnu-liguobin

src/main/kotlin/bitlap/sbt/analyzer/jbexternal/DependencyAnalyzerViewImpl.kt

@@ -14,7 +14,6 @@ import bitlap.sbt.analyzer.jbexternal.util.getDisplayText
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import com.intellij.openapi.actionSystem.DataProvider
 import com.intellij.openapi.actionSystem.DataSink
 import com.intellij.openapi.actionSystem.PlatformCoreDataKeys
 import com.intellij.openapi.application.invokeLater

src/main/resources/messages/SbtDependencyAnalyzerBundle.properties

@@ -12,6 +12,7 @@ analyzer.notification.addSdap.text=The "{0}" has been added or updated, \
   and it has also been ignored by the ".git/info/exclude" file in the git environment, \
   please wait a moment, go to see more.
 analyzer.notification.setting.changed.title=Sbt Dependency Analyzer settings have been changed
+analyzer.notification.reimport.title=Sbt Dependency Analyzer is refreshing the project
 analyzer.notification.updated.failure.title=Failed to load!
 analyzer.notification.updated.failure.text=Open in browser↗
 analyzer.notification.updated.title={0} plugin updated to v{1}

src/main/resources/messages/SbtDependencyAnalyzerBundle_zh.properties

@@ -12,6 +12,7 @@ analyzer.notification.addSdap.text=已添加或更新文件 “{0}”，\
   并且在git环境中也已经被“.git/info/exclude”文件忽略了，\
   请稍等片刻，前往查看更多
 analyzer.notification.setting.changed.title=Sbt Dependency Analyzer 配置已被更改
+analyzer.notification.reimport.title=Sbt Dependency Analyzer 正在刷新项目
 analyzer.notification.updated.failure.title=加载失败！
 analyzer.notification.updated.failure.text=在浏览器中打开↗
 analyzer.notification.updated.title={0} 插件已更新为 v{1}

src/main/scala/bitlap/sbt/analyzer/SbtDependencyAnalyzerContributor.scala

@@ -280,32 +280,37 @@ final class SbtDependencyAnalyzerContributor(project: Project) extends Dependenc
 
 }
 
-object SbtDependencyAnalyzerContributor extends SettingsState.SettingsChangeListener:
-
-  final val isAvailable = new AtomicBoolean(true)
+object SbtDependencyAnalyzerContributor
+    extends SettingsState.SettingsChangeListener,
+      SbtReimportProject.ReimportProjectListener:
+  import com.intellij.openapi.observable.properties.AtomicProperty
+  private final val dependencyIsAvailable = new AtomicProperty[Boolean](true)
 
   // if data change
-  override def onAnalyzerConfigurationChanged(project: Project, settingsState: SettingsState): Unit = {
-    isAvailable.set(false)
-    SbtUtils.refreshProject(project)
-    isAvailable.set(true)
+  override def onConfigurationChanged(project: Project, settingsState: SettingsState): Unit = {
+    SbtReimportProject.ReimportProjectPublisher.onReimportProject(project)
+  }
+
+  override def onReimportProject(project: Project): Unit = {
+    SbtUtils.forceRefreshProject(project)
   }
 
   ApplicationManager.getApplication.getMessageBus.connect().subscribe(SettingsState._Topic, this)
+  ApplicationManager.getApplication.getMessageBus.connect().subscribe(SbtReimportProject._Topic, this)
 
-  private final val isNotifying = new AtomicBoolean(false)
+  private final val hasNotified = new AtomicBoolean(false)
 
   private def isValidFile(project: Project, file: String): Boolean = {
-    if (isAvailable.get()) {
+    if (dependencyIsAvailable.get()) {
       val lastModified = VfsUtil.findFile(Path.of(file), true).getTimeStamp
       val upToDate =
         System.currentTimeMillis() <= lastModified + SettingsState.getSettings(project).fileCacheTimeout * 1000
       if (!upToDate) {
-        isAvailable.set(false)
+        dependencyIsAvailable.set(false)
       }
-      isAvailable.get()
+      dependencyIsAvailable.get()
     } else {
-      isAvailable.get()
+      dependencyIsAvailable.get()
     }
   }
 
@@ -370,10 +375,10 @@ object SbtDependencyAnalyzerContributor extends SettingsState.SettingsChangeList
 
       if (DependencyUtils.canIgnoreModule(module)) return Collections.emptyList()
 
-      if (isNotifying.get() && SbtUtils.untilProjectReady(project)) {
+      if (hasNotified.get() && SbtUtils.untilProjectReady(project)) {
         // must reload project to enable it
         SbtShellOutputAnalysisTask.reloadTask.executeCommand(project)
-        isNotifying.compareAndSet(true, false)
+        hasNotified.compareAndSet(true, false)
       }
 
       // if the analysis files already exist (.dot), use it directly.
@@ -402,7 +407,7 @@ object SbtDependencyAnalyzerContributor extends SettingsState.SettingsChangeList
               createRootScopeNode(scope, project)
             )
         } else {
-          isAvailable.set(true)
+          dependencyIsAvailable.set(true)
           SbtShellDependencyAnalysisTask.dependencyDotTask.executeCommand(
             project,
             moduleData,
@@ -433,7 +438,7 @@ object SbtDependencyAnalyzerContributor extends SettingsState.SettingsChangeList
             }
           } catch {
             case _: AnalyzerCommandNotFoundException =>
-              if (isNotifying.compareAndSet(false, true)) {
+              if (hasNotified.compareAndSet(false, true)) {
                 Notifications.notifyAndCreateSdapFile(project)
               }
               break()

src/main/scala/bitlap/sbt/analyzer/SbtDependencyAnalyzerPanel.java

@@ -60,7 +60,7 @@ void apply() {
         }
         if (changed) {
             Notifications$.MODULE$.notifySettingsChanged(project);
-            SettingsState.SettingsChangePublisher().onAnalyzerConfigurationChanged(this.project, settings);
+            SettingsState.SettingsChangePublisher().onConfigurationChanged(this.project, settings);
         }
     }
 

src/main/scala/bitlap/sbt/analyzer/SettingsState.scala

@@ -50,7 +50,7 @@ object SettingsState {
 
   trait SettingsChangeListener:
 
-    def onAnalyzerConfigurationChanged(project: Project, settingsState: SettingsState): Unit
+    def onConfigurationChanged(project: Project, settingsState: SettingsState): Unit
 
   end SettingsChangeListener
 

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

@@ -3,7 +3,7 @@ package sbt
 package analyzer
 package action
 
-import bitlap.sbt.analyzer.util.SbtUtils
+import bitlap.sbt.analyzer.util.SbtReimportProject
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 
@@ -15,9 +15,7 @@ final class SbtRefreshDependenciesAction extends BaseRefreshDependenciesAction:
     SbtDependencyAnalyzerBundle.message("analyzer.refresh.dependencies.description")
 
   override def actionPerformed(e: AnActionEvent): Unit = {
-    SbtDependencyAnalyzerContributor.isAvailable.set(false)
-    SbtUtils.refreshProject(e.getProject)
-    SbtDependencyAnalyzerContributor.isAvailable.set(true)
+    SbtReimportProject.ReimportProjectPublisher.onReimportProject(e.getProject)
   }
 
 end SbtRefreshDependenciesAction

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

@@ -2,6 +2,7 @@ package bitlap.sbt.analyzer.action
 
 import bitlap.sbt.analyzer.*
 import bitlap.sbt.analyzer.task.*
+import bitlap.sbt.analyzer.util.SbtReimportProject
 import bitlap.sbt.analyzer.util.SbtUtils
 
 import com.intellij.openapi.actionSystem.AnActionEvent
@@ -15,10 +16,8 @@ final class SbtRefreshSnapshotDependenciesAction extends BaseRefreshDependencies
     SbtDependencyAnalyzerBundle.message("analyzer.refresh.snapshot.dependencies.description")
 
   override def actionPerformed(e: AnActionEvent): Unit = {
-    SbtDependencyAnalyzerContributor.isAvailable.set(false)
     SbtShellOutputAnalysisTask.refreshSnapshotsTask.executeCommand(e.getProject)
-    SbtUtils.refreshProject(e.getProject)
-    SbtDependencyAnalyzerContributor.isAvailable.set(true)
+    SbtReimportProject.ReimportProjectPublisher.onReimportProject(e.getProject)
   }
 
 end SbtRefreshSnapshotDependenciesAction

src/main/scala/bitlap/sbt/analyzer/parser/DotUtil.scala

@@ -13,6 +13,7 @@ import scala.util.control.Breaks.breakable
 import org.jetbrains.plugins.scala.extensions.inReadAction
 import org.jetbrains.plugins.scala.project.VirtualFileExt
 
+import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.vfs.VfsUtil
 
 import analyzer.util.Notifications
@@ -23,6 +24,8 @@ import model.ModuleContext
 
 object DotUtil {
 
+  private val LOG = Logger.getInstance(getClass)
+
   private lazy val parser = (new Parser).forEngine(ValidatorEngine.DOT).notValidating()
 
   private def parseAsGraphTestOnly(file: String): MutableGraph = {
@@ -61,6 +64,7 @@ object DotUtil {
       }
     } catch {
       case ignore: Throwable =>
+        LOG.error(ignore)
         Notifications.notifyParseFileError(file, "The file parsing failed")
         null
     }

src/main/scala/bitlap/sbt/analyzer/task/RefreshSnapshotsTask.scala

@@ -20,17 +20,17 @@ final class RefreshSnapshotsTask extends SbtShellOutputAnalysisTask[Unit]:
       getCommandOutputLines(
         project,
         """
-          |set update / skip := false
+          |set update / skip := false;
           |set csrConfiguration := csrConfiguration.value.withTtl(Option(scala.concurrent.duration.DurationInt(0).seconds));
-          |update
+          |update;
           |""".stripMargin
       )
     } else {
       getCommandOutputLines(
         project,
         """
-          |set update / skip := false
-          |update
+          |set update / skip := false;
+          |update;
           |""".stripMargin
       )
     }