minor UX improvements

timkmecl · Dec 7, 2022 · 1be3ca3 · 1be3ca3
1 parent 24b0ad1
commit 1be3ca3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 98 deletions.
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
         {
           "command": "chatgpt.ask",
           "when": "editorTextFocus",
-          "group": "navigation"
+          "group": "chatgpt-menu-group@1"
         }
       ]
     }

diff --git a/src/extension.ts b/src/extension.ts
@@ -17,7 +17,10 @@ export function activate(context: vscode.ExtensionContext) {
 	provider.setSessionToken(sessionToken);
 
 	context.subscriptions.push(
-		vscode.window.registerWebviewViewProvider(ChatGPTViewProvider.viewType, provider));
+		vscode.window.registerWebviewViewProvider(ChatGPTViewProvider.viewType, provider,  {
+			webviewOptions: { retainContextWhenHidden: true }
+		})
+	);
 
 	let disposable2 = vscode.commands.registerCommand('chatgpt.ask', () => {
 		vscode.window.showInputBox({ prompt: 'What do you want to do?' }).then((value) => {
@@ -54,6 +57,7 @@ class ChatGPTViewProvider implements vscode.WebviewViewProvider {
 	private _chatGPTAPI?: ChatGPTAPI;
 
 	private _response?: string;
+	private _prompt?: string;
 
 	private _sessionToken?: string;
 
@@ -117,16 +121,10 @@ class ChatGPTViewProvider implements vscode.WebviewViewProvider {
 					}
 			}
 		});
-
-		// when extension panel opens shows the previous response again
-		webviewView.onDidChangeVisibility(e => {
-			if (this._view && this._view.visible) {
-				this._view.webview.postMessage({ type: 'addResponse', value: this._response });
-			}
-		});
 	}
 
 	public async search(prompt:string|undefined) {
+		this._prompt = prompt;
 		if (!prompt) {
 			prompt = '';
 		};
@@ -136,6 +134,14 @@ class ChatGPTViewProvider implements vscode.WebviewViewProvider {
 			this._newAPI();
 		}
 
+		// focus gpt activity from activity bar
+		if (!this._view) {
+			await vscode.commands.executeCommand('chatgpt.chatView.focus');
+		} else {
+				this._view?.show?.(true);
+		}
+
+
 		let response = '';
 
 		// Check if the ChatGPTAPI instance is signed in
@@ -171,15 +177,11 @@ class ChatGPTViewProvider implements vscode.WebviewViewProvider {
 				searchPrompt = prompt;
 			}
 
-			// focus gpt activity from activity bar
-			vscode.commands.executeCommand('workbench.view.extension.chatgpt');
-
-			// modify the input tag to show the search prompt as input value
-			if (this._view) {
-				this._view.webview.postMessage({ type: 'setPrompt', value: searchPrompt });
-			}
-
 			console.log("sendMessage");
+
+			// Make sure theprompt is shown
+			this._view?.webview.postMessage({ type: 'setPrompt', value: this._prompt });
+
 			// Send the search prompt to the ChatGPTAPI instance and store the response
 			response = await this._chatGPTAPI.sendMessage(searchPrompt, {
 				onProgress: (partialResponse) => {
@@ -193,8 +195,6 @@ class ChatGPTViewProvider implements vscode.WebviewViewProvider {
 		// Saves the response
 		this._response = response;
 
-		// console.log(response);
-
 		// Show the view and send a message to the webview with the response
 		if (this._view) {
 			this._view.show?.(true);

diff --git a/src/test/runTest.ts b/src/test/runTest.ts
diff --git a/src/test/suite/extension.test.ts b/src/test/suite/extension.test.ts
diff --git a/src/test/suite/index.ts b/src/test/suite/index.ts
diff --git a/yarn.lock b/yarn.lock
@@ -274,9 +274,9 @@
     "eslint-visitor-keys" "^3.3.0"
 
 "@vscode/test-electron@^2.2.0":
-  "integrity" "sha512-xk2xrOTMG75/hxO8OVVZ+GErv9gmdZwOD8rEHV3ty3n1Joav2yFcfrmqD6Ukref27U13LEL8gVvSHzauGAK5nQ=="
-  "resolved" "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.0.tgz"
-  "version" "2.2.0"
+  "integrity" "sha512-DUdwSYVc9p/PbGveaq20dbAAXHfvdq4zQ24ILp6PKizOBxrOfMsOq8Vts5nMzeIo0CxtA/RxZLFyDv001PiUSg=="
+  "resolved" "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.2.1.tgz"
+  "version" "2.2.1"
   dependencies:
     "http-proxy-agent" "^4.0.1"
     "https-proxy-agent" "^5.0.0"