re-merge missing vscode files

Author: Calvinn Ng

extensions/vscode/src/activation/activate.ts

@@ -1,54 +1,3 @@
-<<<<<<< HEAD
-import { getTsConfigPath, migrate } from "core/util/paths";
-import { Telemetry } from "core/util/posthog";
-import path from "path";
-import * as vscode from "vscode";
-import { VsCodeExtension } from "../extension/vscodeExtension";
-import registerQuickFixProvider from "../lang-server/codeActions";
-import { getExtensionVersion } from "../util/util";
-import { getExtensionUri } from "../util/vscode";
-import { setupInlineTips } from "./inlineTips";
-
-function showRefactorMigrationMessage(
-  extensionContext: vscode.ExtensionContext,
-) {
-  // Only if the vscode setting continue.manuallyRunningSserver is true
-  const manuallyRunningServer =
-    vscode.workspace
-      .getConfiguration("ahrefs-continue")
-      .get<boolean>("manuallyRunningServer") || false;
-  if (
-    manuallyRunningServer &&
-    extensionContext?.globalState.get<boolean>(
-      "continue.showRefactorMigrationMessage",
-    ) !== false
-  ) {
-    vscode.window
-      .showInformationMessage(
-        "The Continue server protocol was recently updated in a way that requires the latest server version to work properly. Since you are manually running the server, please be sure to upgrade with `pip install --upgrade continuedev`.",
-        "Got it",
-        "Don't show again",
-      )
-      .then((selection) => {
-        if (selection === "Don't show again") {
-          // Get the global state
-          extensionContext?.globalState.update(
-            "continue.showRefactorMigrationMessage",
-            false,
-          );
-        }
-      });
-  }
-}
-
-export async function activateExtension(context: vscode.ExtensionContext) {
-  // Add necessary files
-  getTsConfigPath();
-
-  // Register commands and providers
-  setupInlineTips(context);
-  showRefactorMigrationMessage(context);
-=======
 import { getTsConfigPath, getContinueRcPath, migrate } from "core/util/paths";
 import { Telemetry } from "core/util/posthog";
 import path from "node:path";
@@ -74,7 +23,6 @@ export async function activateExtension(context: vscode.ExtensionContext) {
   const workOsAuthProvider = new WorkOsAuthProvider(context);
   await workOsAuthProvider.initialize();
   context.subscriptions.push(workOsAuthProvider);
->>>>>>> v0.9.184-vscode
 
   const vscodeExtension = new VsCodeExtension(context);
 
@@ -85,23 +33,13 @@ export async function activateExtension(context: vscode.ExtensionContext) {
         path.join(getExtensionUri().fsPath, "media", "welcome.md"),
       ),
     );
-<<<<<<< HEAD
-=======
 
     vscode.commands.executeCommand("continue.focusContinueInput");
->>>>>>> v0.9.184-vscode
   });
 
   // Load Continue configuration
   if (!context.globalState.get("hasBeenInstalled")) {
     context.globalState.update("hasBeenInstalled", true);
-<<<<<<< HEAD
-    Telemetry.capture("install", {
-      extensionVersion: getExtensionVersion(),
-    });
-  }
-}
-=======
     Telemetry.capture(
       "install",
       {
@@ -125,4 +63,3 @@ export async function activateExtension(context: vscode.ExtensionContext) {
       }
     : continuePublicApi;
 }
->>>>>>> v0.9.184-vscode

extensions/vscode/src/activation/inlineTips.ts

@@ -1,17 +1,9 @@
 import * as vscode from "vscode";
-<<<<<<< HEAD
-import { getMetaKeyLabel } from "../util/util";
-
-const inlineTipDecoration = vscode.window.createTextEditorDecorationType({
-  after: {
-    contentText: `${getMetaKeyLabel()} L to select code, ${getMetaKeyLabel()} I to edit`,
-=======
 import { getMetaKeyName } from "../util/util";
 
 const inlineTipDecoration = vscode.window.createTextEditorDecorationType({
   after: {
     contentText: `Add to chat (${getMetaKeyName()}+L) | Edit highlighted code (${getMetaKeyName()}+I).`,
->>>>>>> v0.9.184-vscode
     color: "#888",
     margin: "0 0 0 6em",
     fontWeight: "bold",
@@ -20,11 +12,7 @@ const inlineTipDecoration = vscode.window.createTextEditorDecorationType({
 
 function showInlineTip() {
   return vscode.workspace
-<<<<<<< HEAD
-    .getConfiguration("ahrefs-continue")
-=======
     .getConfiguration("continue")
->>>>>>> v0.9.184-vscode
     .get<boolean>("showInlineTip");
 }
 
@@ -44,11 +32,7 @@ function handleSelectionChange(e: vscode.TextEditorSelectionChangeEvent) {
   const line = Math.max(0, selection.start.line - 1);
 
   const hoverMarkdown = new vscode.MarkdownString(
-<<<<<<< HEAD
-    `Use ${getMetaKeyLabel()} L to select code, or ${getMetaKeyLabel()} I to edit highlighted code. Click [here](command:continue.hideInlineTip) if you don't want to see these inline suggestions.`,
-=======
     `Click [here](command:continue.hideInlineTip) to hide these suggestions`,
->>>>>>> v0.9.184-vscode
   );
   hoverMarkdown.isTrusted = true;
   hoverMarkdown.supportHtml = true;
@@ -66,11 +50,7 @@ function handleSelectionChange(e: vscode.TextEditorSelectionChangeEvent) {
 const emptyFileTooltipDecoration = vscode.window.createTextEditorDecorationType(
   {
     after: {
-<<<<<<< HEAD
-      contentText: `Use ${getMetaKeyLabel()} I to generate code`,
-=======
       contentText: `Use ${getMetaKeyName()}+I to generate code`,
->>>>>>> v0.9.184-vscode
       color: "#888",
       margin: "2em 0 0 0",
       fontStyle: "italic",

extensions/vscode/src/activation/languageClient.ts

@@ -2,17 +2,6 @@
  * If we wanted to run or use another language server from our extension, this is how we would do it.
  */
 
-<<<<<<< HEAD
-import * as path from "path";
-import { ExtensionContext, extensions, workspace } from "vscode";
-
-import {
-  LanguageClient,
-  LanguageClientOptions,
-  ServerOptions,
-  State,
-  StateChangeEvent,
-=======
 import * as path from "node:path";
 import { type ExtensionContext, extensions, workspace } from "vscode";
 
@@ -22,19 +11,14 @@ import {
   type ServerOptions,
   State,
   type StateChangeEvent,
->>>>>>> v0.9.184-vscode
   TransportKind,
 } from "vscode-languageclient/node";
 import { getExtensionUri } from "../util/vscode";
 
 let client: LanguageClient;
 
 export async function startLanguageClient(context: ExtensionContext) {
-<<<<<<< HEAD
-  let pythonLS = startPythonLanguageServer(context);
-=======
   const pythonLS = startPythonLanguageServer(context);
->>>>>>> v0.9.184-vscode
   pythonLS.start();
 }
 
@@ -43,11 +27,7 @@ export async function makeRequest(method: string, param: any): Promise<any> {
     return;
   } else if (client.state === State.Starting) {
     return new Promise((resolve, reject) => {
-<<<<<<< HEAD
-      let stateListener = client.onDidChangeState((e: StateChangeEvent) => {
-=======
       const stateListener = client.onDidChangeState((e: StateChangeEvent) => {
->>>>>>> v0.9.184-vscode
         if (e.newState === State.Running) {
           stateListener.dispose();
           resolve(client.sendRequest(method, param));
@@ -70,11 +50,7 @@ export function deactivate(): Thenable<void> | undefined {
 }
 
 function startPythonLanguageServer(context: ExtensionContext): LanguageClient {
-<<<<<<< HEAD
-  let extensionPath = getExtensionUri().fsPath;
-=======
   const extensionPath = getExtensionUri().fsPath;
->>>>>>> v0.9.184-vscode
   const command = `cd ${path.join(
     extensionPath,
     "scripts",
@@ -89,36 +65,15 @@ function startPythonLanguageServer(context: ExtensionContext): LanguageClient {
       configurationSection: "pyls",
     },
   };
-<<<<<<< HEAD
-  return new LanguageClient(command, serverOptions, clientOptions);
-}
-
-async function startPylance(context: ExtensionContext) {
-  let pylance = extensions.getExtension("ms-python.vscode-pylance");
-=======
   return new LanguageClient(command, serverOptions, clientOptions)
 }
 
 async function startPylance(context: ExtensionContext) {
   const pylance = extensions.getExtension("ms-python.vscode-pylance");
->>>>>>> v0.9.184-vscode
   await pylance?.activate();
   if (!pylance) {
     return;
   }
-<<<<<<< HEAD
-  let { path: lsPath } = await pylance.exports.languageServerFolder();
-
-  // The server is implemented in node
-  let serverModule = context.asAbsolutePath(lsPath);
-  // The debug options for the server
-  // --inspect=6009: runs the server in Node's Inspector mode so VS Code can attach to the server for debugging
-  let debugOptions = { execArgv: ["--nolazy", "--inspect=6009"] };
-
-  // If the extension is launched in debug mode then the debug server options are used
-  // Otherwise the run options are used
-  let serverOptions: ServerOptions = {
-=======
   const { path: lsPath } = await pylance.exports.languageServerFolder();
 
   // The server is implemented in node
@@ -130,7 +85,6 @@ async function startPylance(context: ExtensionContext) {
   // If the extension is launched in debug mode then the debug server options are used
   // Otherwise the run options are used
   const serverOptions: ServerOptions = {
->>>>>>> v0.9.184-vscode
     run: { module: serverModule, transport: TransportKind.ipc },
     debug: {
       module: serverModule,
@@ -140,11 +94,7 @@ async function startPylance(context: ExtensionContext) {
   };
 
   // Options to control the language client
-<<<<<<< HEAD
-  let clientOptions: LanguageClientOptions = {
-=======
   const clientOptions: LanguageClientOptions = {
->>>>>>> v0.9.184-vscode
     // Register the server for plain text documents
     documentSelector: [{ scheme: "file", language: "python" }],
     synchronize: {
@@ -162,7 +112,3 @@ async function startPylance(context: ExtensionContext) {
   );
   return client;
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> v0.9.184-vscode

extensions/vscode/src/autocomplete/completionProvider.ts

@@ -4,26 +4,18 @@ import {
   CompletionProvider,
   type AutocompleteInput,
 } from "core/autocomplete/completionProvider";
-<<<<<<< HEAD
-import type { ConfigHandler } from "core/config/handler";
-=======
 import { ConfigHandler } from "core/config/ConfigHandler";
->>>>>>> v0.9.184-vscode
 import { v4 as uuidv4 } from "uuid";
 import * as vscode from "vscode";
 import type { TabAutocompleteModel } from "../util/loadAutocompleteModel";
 import { getDefinitionsFromLsp } from "./lsp";
 import { RecentlyEditedTracker } from "./recentlyEdited";
-<<<<<<< HEAD
-import { setupStatusBar, stopStatusBarLoading } from "./statusBar";
-=======
 import {
   StatusBarStatus,
   getStatusBarStatus,
   setupStatusBar,
   stopStatusBarLoading,
 } from "./statusBar";
->>>>>>> v0.9.184-vscode
 
 interface VsCodeCompletionInput {
   document: vscode.TextDocument;
@@ -87,13 +79,7 @@ export class ContinueCompletionProvider
     //@ts-ignore
   ): ProviderResult<InlineCompletionItem[] | InlineCompletionList> {
     const enableTabAutocomplete =
-<<<<<<< HEAD
-      vscode.workspace
-        .getConfiguration("ahrefs-continue")
-        .get<boolean>("enableTabAutocomplete") || false;
-=======
       getStatusBarStatus() === StatusBarStatus.Enabled;
->>>>>>> v0.9.184-vscode
     if (token.isCancellationRequested || !enableTabAutocomplete) {
       return null;
     }
@@ -202,12 +188,8 @@ export class ContinueCompletionProvider
         completionId: uuidv4(),
         filepath: document.uri.fsPath,
         pos,
-<<<<<<< HEAD
         recentlyEditedFiles: 
           await this.recentlyEditedTracker.getRecentlyEditedDocuments(),
-=======
-        recentlyEditedFiles: [],
->>>>>>> v0.9.184-vscode
         recentlyEditedRanges:
           await this.recentlyEditedTracker.getRecentlyEditedRanges(),
         clipboardText: clipboardText,
@@ -217,11 +199,7 @@ export class ContinueCompletionProvider
         injectDetails,
       };
 
-<<<<<<< HEAD
-      setupStatusBar(true, true);
-=======
       setupStatusBar(undefined, true);
->>>>>>> v0.9.184-vscode
       const outcome =
         await this.completionProvider.provideInlineCompletionItems(
           input,
@@ -269,19 +247,11 @@ export class ContinueCompletionProvider
         startPos.translate(0, outcome.completion.length),
       );
       const completionItem = new vscode.InlineCompletionItem(
-<<<<<<< HEAD
-          outcome.completion,
-        completionRange,
-          {
-            title: "Log Autocomplete Outcome",
-            command: "continue.logAutocompleteOutcome",
-=======
         outcome.completion,
         completionRange,
         {
           title: "Log Autocomplete Outcome",
           command: "continue.logAutocompleteOutcome",
->>>>>>> v0.9.184-vscode
           arguments: [input.completionId, this.completionProvider],
         },
       );