refactor: avoid eagerly creating service instances

Author: lppedd

src/main/kotlin/com/github/lppedd/cc/completion/LookupEnhancer.kt

@@ -48,10 +48,6 @@ internal class LookupEnhancer(private val lookup: LookupImpl) : LookupListener,
     private val robot = Robot()
   }
 
-  private val commandProcessor = CommandProcessor.getInstance()
-  private val actionManager = ActionManagerEx.getInstanceEx()
-  private val config = CCConfigService.getInstance(lookup.project)
-
   @Volatile private var lookupPopupMenuListenerDisposable: Disposable? = null
   @Volatile private var allActions = emptyList<AnAction>()
   @Volatile private var filterActions = emptyList<FilterAction>()
@@ -78,15 +74,17 @@ internal class LookupEnhancer(private val lookup: LookupImpl) : LookupListener,
     reopenMenu = true
   }
 
-  fun filterSelected(filterAction: FilterAction): Boolean =
-    if (config.providerFilterType == KEEP_SELECTED) {
+  fun filterSelected(filterAction: FilterAction): Boolean {
+    val configService = CCConfigService.getInstance(lookup.project)
+    return if (configService.providerFilterType == KEEP_SELECTED) {
       keepOnlySelectedOrReset(filterAction)
       menuButton?.click()
       false
     } else {
       reopenMenu = true
       true
     }
+  }
 
   override fun lookupShown(event: LookupEvent) {
     try {
@@ -157,7 +155,7 @@ internal class LookupEnhancer(private val lookup: LookupImpl) : LookupListener,
       var disposable = lookupPopupMenuListenerDisposable
       disposable?.dispose()
       disposable = Disposer.newDisposable(lookup, "LookupEnhancer popup menu listener")
-      actionManager.addActionPopupMenuListener(LookupPopupMenuListener(disposable), disposable)
+      ActionManagerEx.getInstanceEx().addActionPopupMenuListener(LookupPopupMenuListener(disposable), disposable)
       lookupPopupMenuListenerDisposable = disposable
       closeMenu = true
     }
@@ -185,7 +183,7 @@ internal class LookupEnhancer(private val lookup: LookupImpl) : LookupListener,
         .invokeCompletion(project, editor, 1)
     }
 
-    commandProcessor.executeCommand(project, command, "Invoke completion", CC.AppName)
+    CommandProcessor.getInstance().executeCommand(project, command, "Invoke completion", CC.AppName)
   }
 
   private inner class LookupPopupMenuListener(private val disposable: Disposable) : ActionPopupMenuListener {

src/main/kotlin/com/github/lppedd/cc/completion/menu/SettingsActions.kt

@@ -25,7 +25,6 @@ internal class SettingsActions(
   private val enhancer: LookupEnhancer,
   private val lookup: LookupImpl,
 ) : ActionGroup("", false), DumbAware {
-  private val config = CCConfigService.getInstance(lookup.project)
   private val actions = arrayOf(
     Separator.create(),
     CompletionModeChangeAction(),
@@ -47,20 +46,16 @@ internal class SettingsActions(
       ActionUpdateThread.EDT
 
     override fun actionPerformed(e: AnActionEvent) {
-      config.completionType =
-        if (config.completionType == TEMPLATE) {
-          POPUP
-        } else {
-          TEMPLATE
-        }
-
+      val configService = CCConfigService.getInstance(lookup.project)
+      configService.completionType = if (configService.completionType == TEMPLATE) POPUP else TEMPLATE
       enhancer.settingChanged()
     }
 
     override fun update(event: AnActionEvent) {
+      val configService = CCConfigService.getInstance(lookup.project)
       event.presentation.also {
         it.updateIcons(AllIcons.General.Settings)
-        it.text = if (config.completionType == TEMPLATE) {
+        it.text = if (configService.completionType == TEMPLATE) {
           "Template ${UIUtil.rightArrow()} Standard"
         } else {
           "Standard ${UIUtil.rightArrow()} Template"
@@ -74,23 +69,18 @@ internal class SettingsActions(
       ActionUpdateThread.EDT
 
     override fun actionPerformed(e: AnActionEvent) {
-      config.providerFilterType =
-        if (config.providerFilterType == HIDE_SELECTED) {
-          KEEP_SELECTED
-        } else {
-          HIDE_SELECTED
-        }
-
+      val configService = CCConfigService.getInstance(lookup.project)
+      configService.providerFilterType = if (configService.providerFilterType == HIDE_SELECTED) KEEP_SELECTED else HIDE_SELECTED
       enhancer.settingChanged()
     }
 
     override fun update(event: AnActionEvent) {
       val hideSelected = CCBundle["cc.completion.menu.filter.hideSelected"]
       val keepSelected = CCBundle["cc.completion.menu.filter.keepSelected"]
-
+      val configService = CCConfigService.getInstance(lookup.project)
       event.presentation.also {
         it.updateIcons(AllIcons.General.Filter)
-        it.text = if (config.providerFilterType == HIDE_SELECTED) {
+        it.text = if (configService.providerFilterType == HIDE_SELECTED) {
           "$hideSelected ${UIUtil.rightArrow()} $keepSelected"
         } else {
           "$keepSelected ${UIUtil.rightArrow()} $hideSelected"

src/main/kotlin/com/github/lppedd/cc/configuration/CCMainConfigurable.kt

@@ -16,8 +16,6 @@ internal class CCMainConfigurable(private val project: Project) : SearchableConf
     private val logger = logger<CCMainConfigurable>()
   }
 
-  private val tokensService = CCTokensService.getInstance(project)
-  private val configService = CCConfigService.getInstance(project)
   private val disposable = Disposer.newDisposable("CCMainConfigurable")
   private lateinit var gui: CCMainConfigurableGui
 
@@ -27,7 +25,9 @@ internal class CCMainConfigurable(private val project: Project) : SearchableConf
   override fun getDisplayName(): String =
     CCBundle["cc.plugin.name"]
 
+  @Suppress("LoggingSimilarMessage")
   override fun createComponent(): JComponent {
+    val configService = CCConfigService.getInstance(project)
     gui = CCMainConfigurableGui(project, disposable)
     gui.completionType = configService.completionType
     gui.isEnableLanguageSupport = configService.enableLanguageSupport
@@ -36,7 +36,7 @@ internal class CCMainConfigurable(private val project: Project) : SearchableConf
     gui.customTokensFilePath = configService.customFilePath
     gui.customCoAuthorsFilePath = configService.customCoAuthorsFilePath
 
-    @Suppress("LoggingSimilarMessage")
+    val tokensService = CCTokensService.getInstance(project)
     val tokens = when (val result = tokensService.getTokens()) {
       is TokensResult.Success -> result.tokens
       is TokensResult.FileError -> {
@@ -53,24 +53,28 @@ internal class CCMainConfigurable(private val project: Project) : SearchableConf
     return gui.rootPanel
   }
 
-  override fun isModified(): Boolean =
-    gui.isValid && (
+  override fun isModified(): Boolean {
+    val configService = CCConfigService.getInstance(project)
+    return gui.isValid && (
         gui.completionType != configService.completionType ||
         gui.isEnableLanguageSupport != configService.enableLanguageSupport ||
         gui.isPrioritizeRecentlyUsed != configService.prioritizeRecentlyUsed ||
         gui.isAutoInsertSpaceAfterColon != configService.autoInsertSpaceAfterColon ||
         gui.customCoAuthorsFilePath != configService.customCoAuthorsFilePath ||
         gui.customTokensFilePath != configService.customFilePath)
+  }
 
+  @Suppress("LoggingSimilarMessage")
   override fun apply() {
+    val configService = CCConfigService.getInstance(project)
     configService.completionType = gui.completionType
     configService.enableLanguageSupport = gui.isEnableLanguageSupport
     configService.prioritizeRecentlyUsed = gui.isPrioritizeRecentlyUsed
     configService.autoInsertSpaceAfterColon = gui.isAutoInsertSpaceAfterColon
     configService.customCoAuthorsFilePath = gui.customCoAuthorsFilePath
     configService.customFilePath = gui.customTokensFilePath
 
-    @Suppress("LoggingSimilarMessage")
+    val tokensService = CCTokensService.getInstance(project)
     when (val result = tokensService.getTokens()) {
       is TokensResult.Success -> gui.setTokens(result.tokens.types)
       is TokensResult.FileError -> {
@@ -89,6 +93,7 @@ internal class CCMainConfigurable(private val project: Project) : SearchableConf
   }
 
   override fun reset() {
+    val configService = CCConfigService.getInstance(project)
     gui.completionType = configService.completionType
     gui.isEnableLanguageSupport = configService.enableLanguageSupport
     gui.isPrioritizeRecentlyUsed = configService.prioritizeRecentlyUsed

src/main/kotlin/com/github/lppedd/cc/configuration/CCProvidersConfigurable.kt

@@ -10,9 +10,7 @@ import javax.swing.JPanel
 /**
  * @author Edoardo Luppi
  */
-internal class CCProvidersConfigurable(project: Project) : SearchableConfigurable {
-  private val configService = CCConfigService.getInstance(project)
-  private val providerService = CommitTokenProviderService.getInstance(project)
+internal class CCProvidersConfigurable(private val project: Project) : SearchableConfigurable {
   private lateinit var gui: CCProvidersConfigurableGui
 
   override fun getId(): String =
@@ -22,6 +20,7 @@ internal class CCProvidersConfigurable(project: Project) : SearchableConfigurabl
     CCBundle["cc.config.providers"]
 
   override fun createComponent(): JPanel {
+    val providerService = CommitTokenProviderService.getInstance(project)
     gui = CCProvidersConfigurableGui()
     gui.setProviders(
       providerService.getTypeProviders(),
@@ -39,6 +38,7 @@ internal class CCProvidersConfigurable(project: Project) : SearchableConfigurabl
     gui.isModified
 
   override fun apply() {
+    val configService = CCConfigService.getInstance(project)
     configService.setTypeProvidersOrder(
       gui.typeProviders
         .mapIndexed { index, provider -> provider.getId() to index }

src/main/kotlin/com/github/lppedd/cc/configuration/component/DefaultTokensFilePickerPanel.kt

@@ -28,10 +28,9 @@ import javax.swing.event.DocumentEvent
  * @author Edoardo Luppi
  */
 internal class DefaultTokensFilePickerPanel(
-  project: Project,
+  private val project: Project,
   private val disposable: Disposable,
 ) : JPanel(GridLayoutManager(2, 1, JBUI.emptyInsets(), 0, 5.scaled)) {
-  private val tokensService = CCTokensService.getInstance(project)
   private val isCustomFile = JBCheckBox(CCBundle["cc.config.customFile"]).also {
     it.addItemListener { event ->
       when (event.stateChange) {
@@ -142,6 +141,7 @@ internal class DefaultTokensFilePickerPanel(
       return ValidationInfo(CCBundle["cc.config.filePicker.error.path"], customFile)
     }
 
+    val tokensService = CCTokensService.getInstance(project)
     val result = tokensService.validateTokensFile(file)
 
     if (result != null) {

src/main/kotlin/com/github/lppedd/cc/inspection/CommitNamingConventionInspectionOptions.kt

@@ -51,23 +51,23 @@ internal class CommitNamingConventionInspectionOptions : ConfigurableUi<Project>
   )
 
   override fun reset(project: Project) {
-    val config = CCConfigService.getInstance(project)
-    typePatternTextField.text = config.typeNamingPattern
-    scopePatternTextField.text = config.scopeNamingPattern
+    val configService = CCConfigService.getInstance(project)
+    typePatternTextField.text = configService.typeNamingPattern
+    scopePatternTextField.text = configService.scopeNamingPattern
   }
 
   override fun isModified(project: Project): Boolean {
-    val config = CCConfigService.getInstance(project)
+    val configService = CCConfigService.getInstance(project)
     return typePatternTextField.isContentValid &&
            scopePatternTextField.isContentValid && (
-               typePatternTextField.text != config.typeNamingPattern ||
-               scopePatternTextField.text != config.scopeNamingPattern)
+               typePatternTextField.text != configService.typeNamingPattern ||
+               scopePatternTextField.text != configService.scopeNamingPattern)
   }
 
   override fun apply(project: Project) {
-    val config = CCConfigService.getInstance(project)
-    config.typeNamingPattern = typePatternTextField.text
-    config.scopeNamingPattern = scopePatternTextField.text
+    val configService = CCConfigService.getInstance(project)
+    configService.typeNamingPattern = typePatternTextField.text
+    configService.scopeNamingPattern = scopePatternTextField.text
   }
 
   override fun getComponent(): JComponent =

src/main/kotlin/com/github/lppedd/cc/language/ConventionalCommitSyntaxHighlighter.kt

@@ -15,7 +15,7 @@ import com.intellij.openapi.editor.colors.TextAttributesKey.createTextAttributes
 /**
  * @author Edoardo Luppi
  */
-internal class ConventionalCommitSyntaxHighlighter(project: Project?) : SyntaxHighlighterBase() {
+internal class ConventionalCommitSyntaxHighlighter(private val project: Project?) : SyntaxHighlighterBase() {
   companion object {
     @JvmField val TYPE: TextAttributesKey = attrs("CONVENTIONAL_COMMIT_TYPE", TEXT)
     @JvmField val SCOPE: TextAttributesKey = attrs("CONVENTIONAL_COMMIT_SCOPE", TEXT)
@@ -45,13 +45,11 @@ internal class ConventionalCommitSyntaxHighlighter(project: Project?) : SyntaxHi
     }
   }
 
-  private val configService = project?.let { CCConfigService.getInstance(it) }
-
   override fun getHighlightingLexer(): Lexer =
     ConventionalCommitLexer()
 
   override fun getTokenHighlights(tokenType: IElementType): Array<TextAttributesKey> =
-    if (configService == null || configService.enableLanguageSupport) {
+    if (project == null || CCConfigService.getInstance(project).enableLanguageSupport) {
       attrsMap.getOrDefault(tokenType, attrsText)
     } else {
       TextAttributesKey.EMPTY_ARRAY

src/main/kotlin/com/github/lppedd/cc/lookupElement/CommitTokenLookupElement.kt

@@ -12,8 +12,7 @@ import com.intellij.codeInsight.lookup.LookupElementPresentation
  * @author Edoardo Luppi
  */
 internal sealed class CommitTokenLookupElement : LookupElement() {
-  @Volatile
-  private var isVisible: Boolean = true
+  @Volatile private var isVisible: Boolean = true
 
   fun setVisible(isVisible: Boolean) {
     this.isVisible = isVisible

src/main/kotlin/com/github/lppedd/cc/lookupElement/TemplateCommitTypeLookupElement.kt

@@ -21,15 +21,13 @@ internal class TemplateCommitTypeLookupElement(
   psiElement: CommitTypePsiElement,
   commitType: CommitType,
 ) : CommitTypeLookupElement(psiElement, commitType) {
-  private val templateSettings = TemplateSettings.getInstance()
-
   /**
    * When the user selects the commit type, a new template has to be initiated.
    * The template should start with the commit type already inserted and with the
    * caret positioned in the commit scope context, with an active completion popup.
    */
   override fun handleInsert(context: InsertionContext) {
-    val template = templateSettings.getTemplateById("ConventionalCommit-cs") as? TemplateImpl ?: return
+    val template = TemplateSettings.getInstance().getTemplateById("ConventionalCommit-cs") as? TemplateImpl ?: return
     val project = context.project
     val editor = context.editor
 

src/main/kotlin/com/github/lppedd/cc/vcs/InternalVcsService.kt

@@ -9,10 +9,12 @@ import com.intellij.openapi.vcs.ProjectLevelVcsManager
 import com.intellij.openapi.vcs.VcsException
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.vcs.log.*
+import com.intellij.vcs.log.data.VcsLogMultiRepoJoiner
 import com.intellij.vcs.log.graph.PermanentGraph
 import com.intellij.vcs.log.impl.VcsLogManager
 import com.intellij.vcs.log.impl.VcsProjectLog
 import com.intellij.vcs.log.visible.filters.VcsLogFilterObject
+import fleet.multiplatform.shims.ConcurrentHashSet
 import java.util.*
 import java.util.Collections.newSetFromMap
 import kotlin.coroutines.cancellation.CancellationException
@@ -26,18 +28,12 @@ internal class InternalVcsService(private val project: Project) : VcsService {
     private val logger = logger<InternalVcsService>()
   }
 
-  private val refreshListeners = mutableSetOf<VcsListener>()
+  private val refreshListeners = ConcurrentHashSet<VcsListener>()
   private val vcsLogRefresher = MyVcsLogRefresher()
-  private val projectVcsManager = ProjectLevelVcsManager.getInstance(project)
-  private val vcsRepositoryManager = VcsRepositoryManager.getInstance(project)
-  private val vcsLogMultiRepoJoiner = VcsLogMultiRepoJoiner<Hash, VcsCommitMetadata>()
   private val subscribedVcsLogProviders = newSetFromMap<VcsLogProvider>(IdentityHashMap(16))
 
-  @Volatile
-  private var cachedCurrentUser: Collection<VcsUser> = emptyList()
-
-  @Volatile
-  private var cachedCommits: Collection<VcsCommitMetadata> = emptyList()
+  @Volatile private var cachedCurrentUser: Set<VcsUser> = emptySet()
+  @Volatile private var cachedCommits: List<VcsCommitMetadata> = emptyList()
 
   override fun refresh() {
     val vcsLogProviders = getVcsLogProviders()
@@ -87,11 +83,12 @@ internal class InternalVcsService(private val project: Project) : VcsService {
         }
       }.toSet()
 
+  @Suppress("UnstableApiUsage")
   private fun <T : Comparable<T>> fetchCommits(sortBy: (VcsCommitMetadata) -> T): List<VcsCommitMetadata> =
     getVcsLogProviders()
       .map { (root, vcsLogProvider) -> fetchCommitsFromLogProvider(root, vcsLogProvider) }
       .toList()
-      .let(vcsLogMultiRepoJoiner::join)
+      .let { VcsLogMultiRepoJoiner<Hash, VcsCommitMetadata>().join(it) }
       .sortedByDescending(sortBy)
 
   private fun fetchCommitsFromLogProvider(root: VirtualFile, vscLogProvider: VcsLogProvider): List<VcsCommitMetadata> {
@@ -103,6 +100,7 @@ internal class InternalVcsService(private val project: Project) : VcsService {
       return emptyList()
     }
 
+    val vcsRepositoryManager = VcsRepositoryManager.getInstance(project)
     val repository = vcsRepositoryManager.getRepositoryForRoot(root)
 
     // If the repository is fresh, it means it doesn't have commits yet, and so no branches.
@@ -144,6 +142,7 @@ internal class InternalVcsService(private val project: Project) : VcsService {
   }
 
   private fun getVcsLogProviders(): Map<VirtualFile, VcsLogProvider> {
+    val projectVcsManager = ProjectLevelVcsManager.getInstance(project)
     val activeVcsRoots = projectVcsManager.getAllVcsRoots().toList()
     return VcsLogManager.findLogProviders(activeVcsRoots, project)
   }