重构代码

Author: yefansky

src/cvbManager.ts

@@ -93,11 +93,17 @@ export function generateTimestamp(): string {
 /**
  * 生成 CVB 格式的文件
  * @param filePaths 文件路径数组
- * @param workspacePath 工作目录路径
  * @param userRequest 用户输入的重构需求
  * @returns 生成的 CVB 文件路径
  */
-export async function generateCvb(filePaths: string[], workspacePath: string, userRequest: string): Promise<string> {
+export async function generateCvb(filePaths: string[], userRequest: string): Promise<string> {
+    const workspaceFolders = vscode.workspace.workspaceFolders;
+    if (!workspaceFolders) {
+        throw new Error('No workspace folder found.');
+    }
+
+    const workspacePath = workspaceFolders[0].uri.fsPath;
+
     // Create temporary directory (if not exists)
     const tmpDir = path.join(workspacePath, '.CodeReDesignWorkSpace');
     if (!fs.existsSync(tmpDir)) {
@@ -228,9 +234,15 @@ export function parseCvb(cvbContent: string): {
 /**
  * 将 CVB 文件内容应用到当前工作目录
  * @param cvbContent CVB 文件内容
- * @param workspacePath 当前工作目录路径
  */
-export function applyCvbToWorkspace(cvbContent: string, workspacePath: string): void {
+export function applyCvbToWorkspace(cvbContent: string): void {
+  const workspaceFolders = vscode.workspace.workspaceFolders;
+  if (!workspaceFolders) {
+    throw new Error('No workspace folder found.');
+  }
+
+  const workspacePath = workspaceFolders[0].uri.fsPath;
+
   // 解析 CVB 文件内容
   const { files } = parseCvb(cvbContent);
 

src/cvbMarkdownHandler.ts

@@ -1,27 +1,27 @@
 import * as vscode from 'vscode';
 
 export function setupCvbAsMarkdown(context: vscode.ExtensionContext) {
-    // 获取配置
+    // 获取配置
     const config = vscode.workspace.getConfiguration('codeReDesign');
     const treatCvbAsMarkdown = config.get('treatCvbAsMarkdown', true);
 
-    // 用于存储原始语言模式
+    // 用于存储原始语言模式
     const originalLanguages: { [key: string]: string } = {};
 
     /**
-     * 设置 .cvb 文件的语言模式
-     * @param enabled 是否将 .cvb 文件视为 Markdown
+     * 设置 .cvb 文件的语言模式
+     * @param enabled 是否将 .cvb 文件视为 Markdown
      */
     function setLanguageForCvbDocuments(enabled: boolean) {
         vscode.workspace.textDocuments.forEach(doc => {
             if (doc.fileName.endsWith('.cvb')) {
                 if (enabled) {
-                    // 保存原始语言模式
+                    // 保存原始语言模式
                     originalLanguages[doc.uri.toString()] = doc.languageId;
-                    // 设置为 Markdown
+                    // 设置为 Markdown
                     vscode.languages.setTextDocumentLanguage(doc, 'markdown');
                 } else {
-                    // 恢复原始语言模式
+                    // 恢复原始语言模式
                     const originalLanguage = originalLanguages[doc.uri.toString()];
                     if (originalLanguage) {
                         vscode.languages.setTextDocumentLanguage(doc, originalLanguage);
@@ -32,12 +32,12 @@ export function setupCvbAsMarkdown(context: vscode.ExtensionContext) {
         });
     }
 
-    // 初始化时设置语言模式
+    // 初始化时设置语言模式
     if (treatCvbAsMarkdown) {
         setLanguageForCvbDocuments(true);
     }
 
-    // 监听文件打开事件
+    // 监听文件打开事件
     const openDocumentListener = vscode.workspace.onDidOpenTextDocument(document => {
         if (document.fileName.endsWith('.cvb') && treatCvbAsMarkdown) {
             originalLanguages[document.uri.toString()] = document.languageId;
@@ -46,7 +46,7 @@ export function setupCvbAsMarkdown(context: vscode.ExtensionContext) {
     });
     context.subscriptions.push(openDocumentListener);
 
-    // 监听配置变化
+    // 监听配置变化
     const configChangeListener = vscode.workspace.onDidChangeConfiguration((e: vscode.ConfigurationChangeEvent) => {
         if (e.affectsConfiguration('codeReDesign.treatCvbAsMarkdown')) {
             const newValue = config.get('treatCvbAsMarkdown', true);

src/extension.ts

@@ -22,7 +22,6 @@ export function activate(context: vscode.ExtensionContext) {
             return;
         }
 
-        const workspacePath = workspaceFolders[0].uri.fsPath;
         const selectedFiles = await selectFiles();
         if (selectedFiles.length === 0) {
             vscode.window.showErrorMessage('No files selected.');
@@ -38,7 +37,7 @@ export function activate(context: vscode.ExtensionContext) {
             return;
         }
 
-        const cvbFilePath = generateCvb(selectedFiles, workspacePath, userRequest);
+        const cvbFilePath = generateCvb(selectedFiles, userRequest);
         vscode.window.showInformationMessage(`CVB file generated at: ${cvbFilePath}`);
     });
 
@@ -130,7 +129,7 @@ export function activate(context: vscode.ExtensionContext) {
 
         try {
             // 应用 CVB 到工作目录
-            applyCvbToWorkspace(cvbContent, workspacePath);
+            applyCvbToWorkspace(cvbContent);
         } catch (error) {
             vscode.window.showErrorMessage(`Failed to apply CVB: ${(error as Error).message}`);
         }

src/fileSelector.ts

@@ -11,9 +11,6 @@ export async function selectFiles(): Promise<string[]> {
         return [];
     }
 
-    // 获取当前工作目录
-    const workspacePath = workspaceFolders[0].uri.fsPath;
-
     // 获取当前目录下的所有源文件
     const files = await vscode.workspace.findFiles('**/*.{cpp,h,c,cxx,hpp,py,lua,ls,lh,ts,js}'); // 支持的文件类型
     const filePaths = files.map(file => file.fsPath);

src/siderBar.ts

@@ -131,7 +131,7 @@ function applyCvb(filePath: string) {
 
   const workspaceFolders = vscode.workspace.workspaceFolders;
   if (workspaceFolders) {
-    applyCvbToWorkspace(cvbContent, workspaceFolders[0].uri.path);
+    applyCvbToWorkspace(cvbContent);
   }
 }