Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import com.intellij.openapi.extensions.PluginId
import com.sina.weibo.agent.extensions.core.ExtensionManager as GlobalExtensionManager
import com.sina.weibo.agent.extensions.config.ExtensionProvider
import com.sina.weibo.agent.extensions.config.ExtensionMetadata
import com.sina.weibo.agent.extensions.core.VsixManager.Companion.getBaseDirectory
import com.sina.weibo.agent.util.PluginConstants.ConfigFiles.getUserConfigDir
import java.io.File

/**
Expand Down Expand Up @@ -383,7 +385,7 @@ class ExtensionHostManager : Disposable {
val homeDir = System.getProperty("user.home")
if (projectPath != null) {
val possiblePaths = listOf(
"$homeDir/.run-vs-agent/plugins/${extensionConfig.getCodeDir()}"
"${getBaseDirectory()}/${extensionConfig.getCodeDir()}"
)

val foundPath = possiblePaths.find { File(it).exists() }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,14 @@ class ExtensionManager(private val project: Project) {
* Set current extension provider
* Note: This only updates the configuration and UI state, does not restart the extension process
*/
fun setCurrentProvider(extensionId: String): Boolean {
fun setCurrentProvider(extensionId: String, forceRestart: Boolean? = false): Boolean {
val provider = extensionProviders[extensionId]
if (provider != null && provider.isAvailable(project)) {
val oldProvider = currentProvider
currentProvider = provider

if (forceRestart == false) {
currentProvider = provider
}

Comment on lines +163 to +170

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Potentially confusing parameter handling

The forceRestart parameter is declared as Boolean? but you're using direct equality comparisons with false. This could lead to unexpected behavior when null is passed. The nullable type suggests three states (true/false/null), but the implementation only handles true vs. non-true.

Consider simplifying the parameter type and logic:

-    fun setCurrentProvider(extensionId: String, forceRestart: Boolean? = false): Boolean {
+    fun setCurrentProvider(extensionId: String, forceRestart: Boolean = false): Boolean {
         val provider = extensionProviders[extensionId]
         if (provider != null && provider.isAvailable(project)) {
             val oldProvider = currentProvider
-            if (forceRestart == false) {
+            if (!forceRestart) {
                 currentProvider = provider
             }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
fun setCurrentProvider(extensionId: String, forceRestart: Boolean? = false): Boolean {
val provider = extensionProviders[extensionId]
if (provider != null && provider.isAvailable(project)) {
val oldProvider = currentProvider
currentProvider = provider
if (forceRestart == false) {
currentProvider = provider
}
fun setCurrentProvider(extensionId: String, forceRestart: Boolean = false): Boolean {
val provider = extensionProviders[extensionId]
if (provider != null && provider.isAvailable(project)) {
val oldProvider = currentProvider
if (!forceRestart) {
currentProvider = provider
}
// …rest of implementation…

// Initialize new provider (but don't restart the process)
provider.initialize(project)

Expand All @@ -179,12 +181,24 @@ class ExtensionManager(private val project: Project) {

// Update button configuration
try {
val buttonManager = DynamicButtonManager.getInstance(project)
buttonManager.setCurrentExtension(extensionId)
if (forceRestart == false) {
val buttonManager = DynamicButtonManager.getInstance(project)
buttonManager.setCurrentExtension(extensionId)
}
} catch (e: Exception) {
LOG.warn("Failed to update button configuration", e)
}

// Update context menu configuration
try {
if (forceRestart == false) {
val contextMenuManager = com.sina.weibo.agent.extensions.ui.contextmenu.DynamicContextMenuManager.getInstance(project)
contextMenuManager.setCurrentExtension(extensionId)
}
} catch (e: Exception) {
LOG.warn("Failed to update context menu configuration", e)
}

// Notify listeners about configuration change
try {
project.messageBus.syncPublisher(ExtensionChangeListener.EXTENSION_CHANGE_TOPIC)
Expand Down
Loading