0.0.5

Author: maxim-saplin

README.md

@@ -44,6 +44,9 @@ The extension is a great addition to Amazon CodeWhisperer or Github Copilot if y
 
 ## Release Notes
 
+### 0.0.5
+- Created code is formatted (Format selection)
+
 ### 0.0.4
 - Time reporting fixed for create or refactor
 - More language profiles for AI priming (Dart, JavaScript, TypeScript, Python, Java, C#, Go, Ruby, Rust, HTML, CSS, JSON, YAML, C, C++, Swift, Objective-C, Objective-C++, Kotlin)

package.json

@@ -2,7 +2,7 @@
   "name": "cptx",
   "displayName": "cptX: ChatGPT as copilot",
   "description": "Use ChatGPT as your (aslmost)free copilot",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "publisher": "MaximSaplin",
   "icon": "images/icon.png",
   "engines": {

src/createOrRefactor.ts

@@ -32,12 +32,11 @@ export async function createOrRefactor(openAi: OpenAIApi) {
                 const refactor = selectedCode.length > 0;
                 let aboveText = '';
                 let belowText = '';
-                let cursorLine = 0;
                 if (refactor) {
                     ({ aboveText, belowText } = common.getCodeAroundSelection(editor));
                 }
                 else {
-                    ({ aboveText, belowText, cursorLine } = common.getCodeAroundCursor(editor));
+                    ({ aboveText, belowText } = common.getCodeAroundCursor(editor));
                 }
 
                 let { expert, language } = common.getExpertAndLanguage(editor);
@@ -56,20 +55,26 @@ export async function createOrRefactor(openAi: OpenAIApi) {
                 }
 
                 if (!token.isCancellationRequested) {
-                    editor.edit((editBuilder) => {
+                    await editor.edit((editBuilder) => {
                         if (refactor) {
                             editBuilder.replace(editor.selection, result);
                         } else {
-                            const selection = new vscode.Selection(cursorLine, 0, cursorLine, 0);
-                            editBuilder.insert(selection.end, '\n');
-                            editBuilder.insert(selection.end, result);
-                            // editor.selection = new vscode.Selection(
-                            //     editor.selection.active.line-1, 0, 
-                            //     editor.selection.active.line-1+result.split('\n').length, 0);
+                            const cursorLineNotEmpty = !editor.document.lineAt(editor.selection.end.line).isEmptyOrWhitespace;
+                            if (cursorLineNotEmpty) {
+                                editBuilder.insert(editor.selection.end, '\n');
+                            }
+                            editBuilder.insert(editor.selection.end, result);
                         }
 
                     });
+                    if (!refactor) {
+                        var endPos = editor.selection.end;
+                        var startPos = new vscode.Position(endPos.line-result.split('\n').length+1, 0);
+                        editor.selection = new vscode.Selection(startPos, endPos);
+                    }
                     vscode.window.showInformationMessage(`cptX completed operation (${common.getElapsed(start)}s)`);
+
+                    await vscode.commands.executeCommand('editor.action.formatSelection');
                 }
             });
     } catch (error) {