refactor(vscode): rename chatOutline to chatOutlineEnabled

fix: fix naming issue
TabbyML · Sep 17, 2024 · c8ec0a3 · c8ec0a3
1 parent 8441371
commit c8ec0a3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/clients/vscode/package.json b/clients/vscode/package.json
@@ -205,7 +205,7 @@
         },
         {
           "command": "tabby.chat.edit.outline.generate",
-          "when": "tabby.chatEnabled && tabby.chat.outline"
+          "when": "tabby.chatEnabled && tabby.chatOutlineEnabled"
         },
         {
           "command": "tabby.chat.edit.stop",
@@ -423,7 +423,8 @@
       {
         "command": "tabby.chat.edit.editNLOutline",
         "key": "ctrl+y",
-        "mac": "cmd+y"
+        "mac": "cmd+y",
+        "when": "tabby.chatOutlineEnabled"
       }
     ],
     "viewsContainers": {
@@ -492,7 +493,6 @@
     "tsc-watch": "^6.2.0",
     "tsup": "^8.0.2",
     "typescript": "^5.3.2",
-    "vscode-languageclient": "^9.0.1",
-    "diff": "^5.2.0"
+    "vscode-languageclient": "^9.0.1"
   }
 }
diff --git a/clients/vscode/src/ContextVariables.ts b/clients/vscode/src/ContextVariables.ts
@@ -16,13 +16,13 @@ export class ContextVariables {
   ) {
     this.chatEnabled = this.client.chat.isAvailable;
     this.inlineCompletionTriggerMode = config.inlineCompletionTriggerMode;
-    this.chatOutline = config.chatOutline;
+    this.chatOutlineEnabled = config.chatOutline;
     this.client.chat.on("didChangeAvailability", (params: boolean) => {
       this.chatEnabled = params;
     });
     this.config.on("updated", () => {
       this.inlineCompletionTriggerMode = config.inlineCompletionTriggerMode;
-      this.chatOutline = config.chatOutline;
+      this.chatOutlineEnabled = config.chatOutline;
     });
     this.updateChatEditResolving();
     window.onDidChangeTextEditorSelection((params) => {
@@ -98,12 +98,12 @@ export class ContextVariables {
     this.inlineCompletionTriggerModeValue = value;
   }
 
-  get chatOutline(): boolean {
+  get chatOutlineEnabled(): boolean {
     return this.chatOutlineValue;
   }
 
-  set chatOutline(value: boolean) {
-    commands.executeCommand("setContext", "tabby.chat.outline", value);
+  set chatOutlineEnabled(value: boolean) {
+    commands.executeCommand("setContext", "tabby.chatOutlineEnabled", value);
     this.chatOutlineValue = value;
   }
 }
diff --git a/clients/vscode/src/outline/NLOutlinesProvider.ts b/clients/vscode/src/outline/NLOutlinesProvider.ts
@@ -19,7 +19,7 @@ import { Config } from "../Config";
 import OpenAI from "openai";
 import generateNLOutlinesPrompt from "../../assets/prompts/generateNLOutlines.txt";
 import editNLOutline from "../../assets/prompts/editNLOutline.txt";
-import * as Diff from "diff";
+import { diffLines } from "diff";
 
 interface ChatNLOutlinesParams {
   location: Location;
@@ -313,7 +313,7 @@ export class NLOutlinesProvider extends EventEmitter<void> implements CodeLensPr
     const removed: string[] = [];
     const unchanged: string[] = [];
 
-    Diff.diffLines(oldCode, newCode).forEach((diff) => {
+    diffLines(oldCode, newCode).forEach((diff) => {
       const lines = diff.value.split("\n").filter((line) => line !== "");
       if (diff.added) {
         added.push(...lines);