Merge branch 'main' into preview

continuedev · May 17, 2024 · 4e33901 · 4e33901
2 parents 9f160ad + b2c7b07
commit 4e33901
Show file tree

Hide file tree

Showing 16 changed files with 14,587 additions and 390 deletions.
diff --git a/core/autocomplete/charStream.ts b/core/autocomplete/charStream.ts
@@ -30,7 +30,9 @@ export async function* noFirstCharNewline(stream: AsyncGenerator<string>) {
   for await (let char of stream) {
     if (first) {
       first = false;
-      if (char === "\n") {return;}
+      if (char === "\n") {
+        return;
+      }
     }
     yield char;
   }
@@ -48,9 +50,9 @@ export async function* stopOnUnmatchedClosingBracket(
 ): AsyncGenerator<string> {
   const stack: string[] = [];
   for (let i = 0; i < suffix.length; i++) {
-    if (suffix[i] === " ") {continue;}
+    if (suffix[i] === " ") continue;
     const openBracket = BRACKETS_REVERSE[suffix[i]];
-    if (!openBracket) {break;}
+    if (!openBracket) break;
     stack.unshift(openBracket);
   }
 

diff --git a/core/autocomplete/completionProvider.ts b/core/autocomplete/completionProvider.ts
@@ -2,13 +2,19 @@ import Handlebars from "handlebars";
 import ignore from "ignore";
 import path from "path";
 import { v4 as uuidv4 } from "uuid";
-import { IDE, ILLM, Position, Range, TabAutocompleteOptions } from "../index.js";
 import { RangeInFileWithContents } from "../commands/util.js";
 import { ConfigHandler } from "../config/handler.js";
 import { streamLines } from "../diff/util.js";
+import {
+  IDE,
+  ILLM,
+  Position,
+  Range,
+  TabAutocompleteOptions,
+} from "../index.js";
 import OpenAI from "../llm/llms/OpenAI.js";
-import { getBasename } from "../util/index.js";
 import { logDevData } from "../util/devdata.js";
+import { getBasename } from "../util/index.js";
 import {
   COUNT_COMPLETION_REJECTED_AFTER,
   DEFAULT_AUTOCOMPLETE_OPTS,
@@ -157,7 +163,9 @@ export async function getTabCompletion(
   }
 
   // Model
-  if (!llm) {return;}
+  if (!llm) {
+    return;
+  }
   if (llm instanceof OpenAI) {
     llm.useLegacyCompletionsEndpoint = true;
   } else if (

diff --git a/core/autocomplete/constructPrompt.ts b/core/autocomplete/constructPrompt.ts
@@ -1,14 +1,18 @@
 import Parser from "web-tree-sitter";
-import { TabAutocompleteOptions } from "../index.js";
 import { RangeInFileWithContents } from "../commands/util.js";
+import { TabAutocompleteOptions } from "../index.js";
 
 import {
   countTokens,
   pruneLinesFromBottom,
   pruneLinesFromTop,
 } from "../llm/countTokens.js";
 import { getAst, getTreePathAtCursor } from "./ast.js";
-import { AutocompleteLanguageInfo, LANGUAGES, Typescript } from "./languages.js";
+import {
+  AutocompleteLanguageInfo,
+  LANGUAGES,
+  Typescript,
+} from "./languages.js";
 import {
   AutocompleteSnippet,
   fillPromptWithSnippets,

diff --git a/core/commands/slash/edit.ts b/core/commands/slash/edit.ts
@@ -1,4 +1,3 @@
-import { ContextItemWithId, ILLM, SlashCommand } from "../../index.js";
 import {
   filterCodeBlockLines,
   filterEnglishLinesAtEnd,
@@ -8,6 +7,7 @@ import {
   streamWithNewLines,
 } from "../../autocomplete/lineStream.js";
 import { streamLines } from "../../diff/util.js";
+import { ContextItemWithId, ILLM, SlashCommand } from "../../index.js";
 import { stripImages } from "../../llm/countTokens.js";
 import {
   dedentAndGetCommonWhitespace,

diff --git a/core/context/providers/CurrentFileContextProvider.ts b/core/context/providers/CurrentFileContextProvider.ts
@@ -1,10 +1,10 @@
-import { BaseContextProvider } from "../index.js";
 import {
   ContextItem,
   ContextProviderDescription,
   ContextProviderExtras,
 } from "../../index.js";
 import { getBasename } from "../../util/index.js";
+import { BaseContextProvider } from "../index.js";
 
 class CurrentFileContextProvider extends BaseContextProvider {
   static description: ContextProviderDescription = {

diff --git a/core/context/providers/index.ts b/core/context/providers/index.ts
@@ -1,5 +1,5 @@
-import { BaseContextProvider } from "../index.js";
 import { ContextProviderName } from "../../index.js";
+import { BaseContextProvider } from "../index.js";
 import CodeContextProvider from "./CodeContextProvider.js";
 import CodebaseContextProvider from "./CodebaseContextProvider.js";
 import CurrentFileContextProvider from "./CurrentFileContextProvider.js";