Refactor code structure for improved readability and maintainability

Author: DeveloperPuneet

CodeCharm-0.4.7.vsix CodeCharm-0.4.8.vsixCodeCharm-0.4.7.vsix renamed to CodeCharm-0.4.8.vsix

@@ -25,6 +25,8 @@ CodeCharm is your intelligent VS Code extension that generates **inline code com
 - ⌨️ **Shortcut support**:
   - `Ctrl + Win + J` → Add Inline Comments
   - `Ctrl + Win + G` → Refactor Code
+  - `Ctrl + Win + H` → Comment + Refactor (adds inline emoji comments AND refactors the code)
+  - `Ctrl + Win + K` → Run only the instruction inside `cmd()` (no other changes)
 - 🔁 **Model Fallback Support**: Uses the following Gemini models in this order:
   1. `gemini-2.0-flash-lite`
   2. `gemini-2.0-flash`
@@ -40,7 +42,8 @@ CodeCharm is your intelligent VS Code extension that generates **inline code com
 - 🆕 **Execute `cmd()` instructions inside your code**  
   - Add a line like: `cmd(import pandas)` at the top of your code block.  
   - CodeCharm will first apply your instruction (e.g., add imports, modify setup)  
-    and then generate inline comments or refactor the code.
+    and then generate inline comments or refactor the code. You can also run the combined action with `Ctrl + Win + H` to perform both at once.
+    - Press `Ctrl + Win + K` to run only the `cmd()` instruction found in the selection (the extension sends only the `cmd()` instruction to the assistant and returns the modified code).
     > **Tip:** You can add a `cmd()` instruction before running CodeCharm  
 > Example:
 > ```js
@@ -60,6 +63,8 @@ To use CodeCharm, you'll need your **own Google Gemini API key**:
 2. Copy your API key.
 3. Open VS Code.
 4. Press `Ctrl + Win + J` or `Ctrl + Win + G` for the first time.
+  - Or press `Ctrl + Win + H` to run both commenting and refactoring in one step.
+  - Press `Ctrl + Win + K` to run only the instruction inside `cmd()` in your selection.
 5. A secure input box will appear → paste your key there.
 6. It will be saved automatically in:  
 > **Tip:** You can add a `cmd()` instruction before running CodeCharm  
@@ -82,6 +87,8 @@ To use CodeCharm, you'll need your **own Google Gemini API key**:
 2. Press:
    - `Ctrl + Win + J` → for inline comments
    - `Ctrl + Win + G` → to refactor code
+  - `Ctrl + Win + H` → to both refactor and add inline emoji comments (follows any `cmd()` instructions)
+  - `Ctrl + Win + K` → to only execute the `cmd()` instruction and return the modified code (no other changes)
 3. CodeCharm will generate and replace your selection with an improved version.
 > **Tip:** You can add a `cmd()` instruction before running CodeCharm  
 > Example:

README.md

@@ -2,7 +2,7 @@
   "name": "CodeCharm",
   "displayName": "CodeCharm",
   "description": "AI-powered code comment generator for VS Code using Gemini",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "publisher": "DeveloperPuneet",
   "icon": "images/Icon.png",
   "engines": {
@@ -24,11 +24,16 @@
     "inline comments",
     "developer tools",
     "productivity",
-    "vs code extension"
+    "vs code extension",
+    "tools",
+    "shortcuts",
+    "code generator"
   ],
   "activationEvents": [
     "onCommand:CodeCharm.commentFunction",
     "onCommand:CodeCharm.suggestReadableCode",
+    "onCommand:CodeCharm.commentAndRefactor",
+    "onCommand:CodeCharm.runCmdOnly",
     "onCommand:CodeCharm.setApiKey"
   ],
   "main": "./src/extension.js",
@@ -45,6 +50,15 @@
       {
         "command": "CodeCharm.setApiKey",
         "title": "🔑 CodeCharm: Set Gemini API Key"
+      },
+      {
+        "command": "CodeCharm.commentAndRefactor",
+        "title": "✨ CodeCharm: Comment & Refactor (Ctrl+Win+H)"
+      }
+      ,
+      {
+        "command": "CodeCharm.runCmdOnly",
+        "title": "⚡ CodeCharm: Run cmd() Instruction Only (Ctrl+Win+K)"
       }
     ],
     "keybindings": [
@@ -58,6 +72,18 @@
         "key": "ctrl+win+g",
         "when": "editorTextFocus"
       }
+      ,
+      {
+        "command": "CodeCharm.commentAndRefactor",
+        "key": "ctrl+win+h",
+        "when": "editorTextFocus"
+      }
+      ,
+      {
+        "command": "CodeCharm.runCmdOnly",
+        "key": "ctrl+win+k",
+        "when": "editorTextFocus"
+      }
     ],
     "configuration": {
       "title": "CodeCharm Settings",

node_modules/.package-lock.json

@@ -83,6 +83,67 @@ async function activate(context) {
         });
     });
 
+    const combinedCommand = vscode.commands.registerCommand('CodeCharm.commentAndRefactor', async function () {
+        const editor = vscode.window.activeTextEditor;
+        if (!editor) return;
+
+        const selection = editor.selection;
+        const selectedText = editor.document.getText(selection);
+
+        if (!selectedText) {
+            vscode.window.showInformationMessage("No code selected!");
+            return;
+        }
+
+        // First request a refactor to ensure code is improved
+        const refactored = await getCommentFromGemini(selectedText, "readability");
+        if (!refactored) {
+            vscode.window.showErrorMessage("Gemini refactor failed.");
+            return;
+        }
+
+        // Then add concise inline emoji comments to the refactored result
+        const commented = await getCommentFromGemini(refactored, "comment");
+        if (!commented) {
+            vscode.window.showErrorMessage("Gemini commenting failed after refactor.");
+            return;
+        }
+
+        editor.edit(editBuilder => {
+            editBuilder.replace(selection, commented);
+        });
+    });
+
+    const runCmdCommand = vscode.commands.registerCommand('CodeCharm.runCmdOnly', async function () {
+        const editor = vscode.window.activeTextEditor;
+        if (!editor) return;
+
+        const selection = editor.selection;
+        const selectedText = editor.document.getText(selection);
+
+        if (!selectedText) {
+            vscode.window.showInformationMessage("No code selected!");
+            return;
+        }
+
+        const match = selectedText.match(/cmd\(([^)]+)\)/);
+        if (!match) {
+            vscode.window.showInformationMessage("No cmd() instruction found in selection.");
+            return;
+        }
+
+        const instruction = match[1].trim();
+        const result = await getCommentFromGemini(selectedText, "cmd", instruction);
+        if (!result) {
+            vscode.window.showErrorMessage("Gemini cmd execution failed.");
+            return;
+        }
+
+        editor.edit(editBuilder => {
+            editBuilder.replace(selection, result);
+        });
+    });
+
     const setApiKeyCommand = vscode.commands.registerCommand('CodeCharm.setApiKey', async function () {
         const userInput = await vscode.window.showInputBox({
             prompt: "Enter your Gemini API Key",
@@ -99,18 +160,28 @@ async function activate(context) {
         }
     });
 
-    context.subscriptions.push(commentCommand, readableCommand, setApiKeyCommand); // Add subscriptions to context
+    context.subscriptions.push(commentCommand, readableCommand, combinedCommand, runCmdCommand, setApiKeyCommand); // Add subscriptions to context
 
     vscode.window.showInformationMessage("💫 CodeCharm loaded!"); // Show startup message
 }
 
 Additional_functionalies = `Before doing anything, check if the provided code contains a pattern like cmd(...); if found, treat the text inside cmd() as an instruction to modify the code first (for example, cmd(import pandas library) means you should add "import pandas as pd" at the top). If no cmd() is found, do not print any messages or placeholders—simply continue processing the code silently.`
 
 // 🧠 Get Gemini Comment or Refactor
-async function getCommentFromGemini(code, mode = "comment") {
-    let prompt = mode === "comment"
-        ? `You are a strict code-commenting assistant. Only add inline comments (4–5 words max) using emojis. Do NOT explain or return markdown. Return ONLY the modified code. ${Additional_functionalies} \n\n${code}`
-        : `Refactor this code for readability. Rename unclear variables, break down complex parts. DO NOT return explanation. ONLY the cleaned code. ${Additional_functionalies} \n\n${code}`;
+async function getCommentFromGemini(code, mode = "comment", cmdInstruction = null) {
+    let prompt;
+    if (mode === "comment") {
+        prompt = `You are a strict code-commenting assistant. Only add inline comments (4–5 words max) using emojis. Do NOT explain or return markdown. Return ONLY the modified code. ${Additional_functionalies} \n\n${code}`;
+    } else if (mode === "readability") {
+        prompt = `Refactor this code for readability. Rename unclear variables, break down complex parts. DO NOT return explanation. ONLY the cleaned code. ${Additional_functionalies} \n\n${code}`;
+    } else if (mode === "both") {
+        prompt = `You are a code refactoring assistant. Thoroughly refactor the provided code to maximize readability while preserving behavior: rename unclear variables to descriptive names, simplify complex expressions and control flow, extract repeated or large blocks into helper functions, and improve formatting. After refactoring, add concise inline comments (4–5 words max) must using emojis to clarify intent. Do NOT include explanations or markdown — return ONLY the modified code (remove any cmd() lines or placeholders). ${Additional_functionalies} \n\n${code}`;
+    } else if (mode === "cmd") {
+        const instr = cmdInstruction ? cmdInstruction : "";
+        prompt = `You are a code assistant. There is an instruction inside cmd(): "${instr}". Apply ONLY that instruction to the provided code. Do NOT refactor, add comments, or provide explanations. Remove the cmd() line from the output. Return ONLY the modified code. ${Additional_functionalies} \n\n${code}`;
+    } else {
+        prompt = `${Additional_functionalies} \n\n${code}`;
+    }
 
     const apiKey = await getOrPromptAPIKey();
     if (!apiKey) return null;