Merge pull request #125 from wecode-ai/add_a_default_method_for_theme

Add a default method for theme

Author: Micro66

jetbrains_plugin/src/main/kotlin/com/sina/weibo/agent/core/RPCManager.kt

@@ -54,27 +54,28 @@ class RPCManager(
                 // Send empty configuration model
                 logger.info("Sending configuration information to extension process")
                 val themeName =
-                    if (ThemeManager.getInstance().isDarkThemeForce()) "Default Dark Modern" else "Default Light Modern"
+                    if (ThemeManager.getInstance().isDarkThemeForce()) "Visual Studio 2017 Dark - C++" else "Visual Studio 2017 Light - C++"
 
-                // Create empty configuration model
-                val emptyMap = mapOf(
-                    "contents" to emptyMap<String, Any>(),
-                    "keys" to emptyList<String>(),
-                    "overrides" to emptyList<String>()
-                )
                 // Get proxy configuration
                 val httpProxyConfig = ProxyConfigUtil.getHttpProxyConfigForInitialization()
-                
+
                 // Build configuration contents
                 val contentsBuilder = mutableMapOf<String, Any>(
-                    "workbench" to mapOf("colorTheme" to themeName)
+                    "workbench.colorTheme" to themeName
                 )
-                
+
                 // Add proxy configuration if available
                 httpProxyConfig?.let {
                     contentsBuilder["http"] = it
                     logger.info("Using proxy configuration for initialization: $it")
                 }
+
+                // Create empty configuration model
+                val emptyMap = mapOf(
+                    "contents" to emptyMap<String, Any>(),
+                    "keys" to emptyList<String>(),
+                    "overrides" to emptyList<String>()
+                )
 
                 val emptyConfigModel = mapOf(
                     "defaults" to mapOf(

jetbrains_plugin/src/main/kotlin/com/sina/weibo/agent/extensions/core/VsixManager.kt

@@ -6,6 +6,7 @@ package com.sina.weibo.agent.extensions.core
 
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
+import com.sina.weibo.agent.theme.ThemeManager.Companion.getDefaultThemeResourceDir
 import com.sina.weibo.agent.theme.ThemeManager.Companion.getThemeResourceDir
 import com.sina.weibo.agent.util.PluginConstants.ConfigFiles.getUserConfigDir
 import java.io.File
@@ -276,10 +277,10 @@ class VsixManager {
                 return
             }
 
-            val integrationsThemeDir = getThemeResourceDir(extensionDir)
+            var integrationsThemeDir = getThemeResourceDir(extensionDir)
             if (integrationsThemeDir == null) {
-                LOG.warn("Plugin themes directory not found, skipping themes copy")
-                return
+                integrationsThemeDir = getDefaultThemeResourceDir(extensionDir)
+                LOG.warn("Plugin themes directory not found, mkdir")
             }
 
             // Create integrations theme directory

jetbrains_plugin/src/main/kotlin/com/sina/weibo/agent/theme/ThemeManager.kt

@@ -15,6 +15,7 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.util.Disposer
 import com.intellij.util.messages.MessageBusConnection
+import com.sina.weibo.agent.core.ServiceProxyRegistry
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
@@ -64,7 +65,7 @@ class ThemeManager : Disposable {
 
     // JSON serialization
     private val gson = Gson()
-    
+
     /**
      * Initialize theme manager
      * @param resourceRoot Theme resource root directory
@@ -404,53 +405,55 @@ class ThemeManager : Disposable {
             val themeFile = themeResourceDir?.resolve(themeFileName)?.toFile()
             val vscodeThemeFile = themeResourceDir?.resolve(vscodeThemeName)?.toFile()
 
-            if (themeFile?.exists() == true && vscodeThemeFile?.exists() == true) {
-                // Read theme file content
-                val themeContent = themeFile.readText()
-                
-                // Parse theme content
-                val parsed = parseThemeString(themeContent)
-                
-                // Handle include field, similar to getTheme.ts logic
-                var finalTheme = parsed
-                if (parsed.has("include")) {
-                    val includeFileName = parsed.get("include").asString
-                    val includePath = themeResourceDir?.resolve(includeFileName)
-                    
-                    if (includePath != null && includePath.exists()) {
-                        try {
-                            val includeContent = includePath.toFile().readText()
-                            val includeTheme = parseThemeString(includeContent)
-                            finalTheme = mergeJsonObjects(finalTheme, includeTheme)
-                        } catch (e: Exception) {
-                            logger.error("Error processing include theme: $includeFileName", e)
-                        }
+            val cssExists = vscodeThemeFile?.exists() == true
+            if (!cssExists) {
+                logger.warn("VSCode theme style file does not exist: $vscodeThemeName")
+                return
+            }
+
+            // Read theme file content if it exists; otherwise proceed with an empty theme
+            val themeContent = if (themeFile?.exists() == true) themeFile.readText() else ""
+
+            // Parse theme content when non-blank; otherwise start from an empty JsonObject
+            val parsed = if (themeContent.isNotBlank()) parseThemeString(themeContent) else JsonObject()
+
+            // Handle include field, similar to getTheme.ts logic
+            var finalTheme = parsed
+            if (parsed.has("include")) {
+                val includeFileName = parsed.get("include").asString
+                val includePath = themeResourceDir?.resolve(includeFileName)
+
+                if (includePath != null && includePath.exists()) {
+                    try {
+                        val includeContent = includePath.toFile().readText()
+                        val includeTheme = parseThemeString(includeContent)
+                        finalTheme = mergeJsonObjects(finalTheme, includeTheme)
+                    } catch (e: Exception) {
+                        logger.error("Error processing include theme: $includeFileName", e)
                     }
                 }
-                
-                // Convert theme
-                val converted = convertTheme(finalTheme)
-                
-                // Read VSCode theme style file
-                themeStyleContent = loadVscodeThemeStyle(vscodeThemeFile)
-                
-                // Add style content to converted theme object
-                if (themeStyleContent != null) {
-                    converted.addProperty("cssContent", themeStyleContent)
-                }
-                
-                // Update cache
-                val oldConfig = currentThemeConfig
-                currentThemeConfig = converted
-                
-                logger.info("Loaded and converted theme configuration: $themeFileName")
-                
-                // Notify listeners when configuration changes
-                if (oldConfig?.toString() != converted.toString()) {
-                    notifyThemeChangeListeners()
-                }
-            } else {
-                logger.warn("Theme configuration file does not exist: $themeFileName")
+            }
+
+            // Convert theme (works even if finalTheme is empty)
+            val converted = convertTheme(finalTheme)
+
+            // Read VSCode theme style file
+            themeStyleContent = vscodeThemeFile?.let { loadVscodeThemeStyle(it) }
+
+            // Add style content to converted theme object
+            if (themeStyleContent != null) {
+                converted.addProperty("cssContent", themeStyleContent)
+            }
+
+            // Update cache
+            val oldConfig = currentThemeConfig
+            currentThemeConfig = converted
+
+            logger.info("Loaded and converted theme configuration: $themeFileName (theme exists: ${themeFile?.exists() == true}, css exists: $cssExists)")
+
+            // Notify listeners when configuration changes
+            if (oldConfig?.toString() != converted.toString()) {
+                notifyThemeChangeListeners()
             }
         } catch (e: IOException) {
             logger.error("Error reading theme configuration", e)
@@ -570,14 +573,18 @@ class ThemeManager : Disposable {
 
             if (themeDir.notExists()) {
                 // Try second path: integrations/theme/default-themes
-                themeDir = Paths.get(resourceRoot, "integrations", "theme", "default-themes")
+                themeDir = getDefaultThemeResourceDir(resourceRoot);
                 if (themeDir.notExists()) {
                     return null
                 }
             }
 
             return themeDir
         }
+
+        fun getDefaultThemeResourceDir(resourceRoot: String):  Path {
+            return Paths.get(resourceRoot, "integrations", "theme", "default-themes")
+        }
 
         /**
          * Get theme manager instance