From b734c69d61bea53321ff27a431c30e43582df30a Mon Sep 17 00:00:00 2001 From: "bobo.yang" Date: Wed, 27 Dec 2023 16:15:39 +0800 Subject: [PATCH] set lang config default value --- package.json | 2 +- src/extension.ts | 11 +++++++++++ src/handler/handlerRegister.ts | 2 -- src/handler/langHandler.ts | 25 ------------------------- src/ide_services/services.ts | 2 +- 5 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 src/handler/langHandler.ts diff --git a/package.json b/package.json index 5b2d228..954e449 100644 --- a/package.json +++ b/package.json @@ -554,7 +554,7 @@ }, "DevChat.Language": { "type": "string", - "default": "en", + "default": "", "enum": ["en", "zh"], "enumDescriptions": [ "English", diff --git a/src/extension.ts b/src/extension.ts index 967cdfd..674d734 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -206,6 +206,16 @@ async function configUpdate0912To0924() { } } +async function setLangDefaultValue() { + const lang = vscode.env.language; + if (!UiUtilWrapper.getConfiguration("DevChat", "Language")) { + if (lang.startsWith("zh-")) { + UiUtilWrapper.updateConfiguration("DevChat", "Language", "zh"); + } else { + UiUtilWrapper.updateConfiguration("DevChat", "Language", "en"); + } + } +} async function activate(context: vscode.ExtensionContext) { ExtensionContextHolder.context = context; @@ -216,6 +226,7 @@ async function activate(context: vscode.ExtensionContext) { await configUpdateTo0924(); await configUpdate0912To0924(); await configUpdateTo1115(); + await setLangDefaultValue(); regLanguageContext(); registerCodeLensProvider(context); diff --git a/src/handler/handlerRegister.ts b/src/handler/handlerRegister.ts index 795cb97..395aa05 100644 --- a/src/handler/handlerRegister.ts +++ b/src/handler/handlerRegister.ts @@ -15,7 +15,6 @@ import { getSetting, updateSetting } from './userSettingHandler'; import { featureToggle, getFeatureToggles } from './featureToggleHandler'; import { getUserAccessKey } from './accessKeyHandler'; import { getValidLlmModelList } from './llmModelHandler'; -import { getIdeLanguage } from './langHandler'; // According to the context menu selected by the user, add the corresponding context file @@ -80,4 +79,3 @@ messageHandler.registerHandler('regModelList', getValidLlmModelList); messageHandler.registerHandler('userInput', userInput); -messageHandler.registerHandler('getIdeLanguage', getIdeLanguage); diff --git a/src/handler/langHandler.ts b/src/handler/langHandler.ts deleted file mode 100644 index ad1c97e..0000000 --- a/src/handler/langHandler.ts +++ /dev/null @@ -1,25 +0,0 @@ -import * as vscode from 'vscode'; -import { regInMessage, regOutMessage } from '../util/reg_messages'; // Ensure these functions are imported -import { MessageHandler } from './messageHandler'; - -// Register the incoming and outgoing messages for the 'getIdeLanguage' command -regInMessage({ command: 'getIdeLanguage' }); -regOutMessage({ command: 'ideLanguage', lang: "" }); // Placeholder for the lang property -// Implement the handler function to get the current IDE language setting -export async function getIdeLanguage(panel: vscode.WebviewPanel | vscode.WebviewView): Promise { - // Get the current IDE language setting - let ideLanguage = vscode.env.language; - if (ideLanguage.startsWith("zh-")) { - ideLanguage = "zh"; - } - // 'en' stands for English, 'zh' stands for Simplified Chinese - - // Construct the message with the language information - const langMessage = { - "command": "ideLanguage", - "lang": ideLanguage - }; - - // Send the message to the webview panel or view - MessageHandler.sendMessage(panel, langMessage); -} \ No newline at end of file diff --git a/src/ide_services/services.ts b/src/ide_services/services.ts index 4161409..fb07147 100644 --- a/src/ide_services/services.ts +++ b/src/ide_services/services.ts @@ -33,7 +33,7 @@ const functionRegistry: any = { "/ide_language": { "keys": [], "handler": async () => { - const language = vscode.env.language.startsWith("zh-") ? "zh" : "en"; + const language = UiUtilWrapper.getConfiguration("DevChat", "Language"); // 'en' stands for English, 'zh' stands for Simplified Chinese return language; }