From 15dadc6c47275f38741c2d1f4c010ebd8dfa4147 Mon Sep 17 00:00:00 2001
From: Rob Lourens <roblourens@gmail.com>
Date: Wed, 4 Sep 2024 20:01:34 -0700
Subject: [PATCH] Clean up

---
 chat-sample/src/extension.ts | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/chat-sample/src/extension.ts b/chat-sample/src/extension.ts
index b5eed266..52222019 100644
--- a/chat-sample/src/extension.ts
+++ b/chat-sample/src/extension.ts
@@ -3,12 +3,12 @@ import * as vscode from 'vscode';
 import { CatToolPrompt } from './play';
 
 export function activate(context: vscode.ExtensionContext) {
-    context.subscriptions.push(registerChatTool());
-    context.subscriptions.push(registerChatParticipant());
+    registerChatTool(context);
+    registerChatParticipant(context);
 }
 
-function registerChatTool() {
-    vscode.lm.registerTool('chat-sample_catVoice', {
+function registerChatTool(context: vscode.ExtensionContext) {
+    context.subscriptions.push(vscode.lm.registerTool('chat-sample_catVoice', {
         async invoke(options, token) {
             return {
                 [contentType]: await renderElementJSON(CatToolPrompt, {}, options.tokenOptions, token),
@@ -17,13 +17,13 @@ function registerChatTool() {
                 },
             };
         },
-    });
+    }));
 
     interface ITabCountParameters {
         tabGroup?: number;
     }
 
-    return vscode.lm.registerTool('chat-sample_tabCount', {
+    context.subscriptions.push(vscode.lm.registerTool('chat-sample_tabCount', {
         async invoke(options, token) {
             return {
                 toString() {
@@ -36,14 +36,13 @@ function registerChatTool() {
                         const group = vscode.window.tabGroups.activeTabGroup;
                         return `There are ${group.tabs.length} tabs open.`;
                     }
-                
                 },
             };
         },
-    });
+    }));
 }
 
-function registerChatParticipant() {
+function registerChatParticipant(context: vscode.ExtensionContext) {
     const handler: vscode.ChatRequestHandler = async (request: vscode.ChatRequest, chatContext: vscode.ChatContext, stream: vscode.ChatResponseStream, token: vscode.CancellationToken) => {
         const models = await vscode.lm.selectChatModels({
             vendor: 'copilot',
@@ -132,8 +131,7 @@ function registerChatParticipant() {
 
     const toolUser = vscode.chat.createChatParticipant('chat-sample.tools', handler);
     toolUser.iconPath = new vscode.ThemeIcon('tools');
-
-    return toolUser;
+    context.subscriptions.push(toolUser);
 }