summaryrefslogtreecommitdiff
path: root/extension/src
diff options
context:
space:
mode:
Diffstat (limited to 'extension/src')
-rw-r--r--extension/src/activation/activate.ts62
-rw-r--r--extension/src/activation/environmentSetup.ts218
-rw-r--r--extension/src/commands.ts15
-rw-r--r--extension/src/continueIdeClient.ts26
-rw-r--r--extension/src/lang-server/codeLens.ts62
-rw-r--r--extension/src/test-suite/environmentSetup.test.ts4
-rw-r--r--extension/src/util/messenger.ts9
7 files changed, 258 insertions, 138 deletions
diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index 9fcaf685..edd13137 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -22,6 +22,39 @@ function getExtensionVersionInt(versionString: string): number {
return parseInt(versionString.replace(/\./g, ""));
}
+function addPythonPathForConfig() {
+ // Add to python.analysis.extraPaths global setting so config.py gets LSP
+
+ if (
+ vscode.workspace.workspaceFolders?.some((folder) =>
+ folder.uri.fsPath.endsWith("continue")
+ )
+ ) {
+ // Not for the Continue repo
+ return;
+ }
+
+ const pythonConfig = vscode.workspace.getConfiguration("python");
+ const analysisPaths = pythonConfig.get<string[]>("analysis.extraPaths");
+ const autoCompletePaths = pythonConfig.get<string[]>(
+ "autoComplete.extraPaths"
+ );
+ const pathToAdd = extensionContext?.extensionPath;
+ if (analysisPaths && pathToAdd && !analysisPaths.includes(pathToAdd)) {
+ analysisPaths.push(pathToAdd);
+ pythonConfig.update("analysis.extraPaths", analysisPaths);
+ }
+
+ if (
+ autoCompletePaths &&
+ pathToAdd &&
+ !autoCompletePaths.includes(pathToAdd)
+ ) {
+ autoCompletePaths.push(pathToAdd);
+ pythonConfig.update("autoComplete.extraPaths", autoCompletePaths);
+ }
+}
+
export async function activateExtension(context: vscode.ExtensionContext) {
extensionContext = context;
console.log("Using Continue version: ", getExtensionVersion());
@@ -33,39 +66,12 @@ export async function activateExtension(context: vscode.ExtensionContext) {
} catch (e) {
console.log("Error getting workspace folder: ", e);
}
- // Before anything else, check whether this is an out-of-date version of the extension
- // Do so by grabbing the package.json off of the GitHub repository for now.
- fetch(PACKAGE_JSON_RAW_GITHUB_URL)
- .then(async (res) => res.json())
- .then((packageJson) => {
- const n1 = getExtensionVersionInt(packageJson.version);
- const n2 = getExtensionVersionInt(getExtensionVersion());
- if (Math.abs(n1 - n2) > 1) {
- // Accept up to 1 version difference
- vscode.window.showInformationMessage(
- `You are using an out-of-date version of the Continue extension. Please update to the latest version.`
- );
- }
- })
- .catch((e) => console.log("Error checking for extension updates: ", e));
-
- // Add to python.analysis.extraPaths global setting
- // const pythonConfig = vscode.workspace.getConfiguration("python");
- // const extraPaths = pythonConfig.get<string[]>("analysis.extraPaths");
- // const pathToAdd = path.join(os.homedir(), ".continue", "server");
- // if (extraPaths) {
- // if (!extraPaths.includes(pathToAdd)) {
- // extraPaths.push(pathToAdd);
- // pythonConfig.update("analysis.extraPaths", extraPaths);
- // }
- // } else {
- // pythonConfig.update("analysis.extraPaths", [pathToAdd]);
- // }
// Register commands and providers
registerAllCodeLensProviders(context);
registerAllCommands(context);
registerQuickFixProvider();
+ addPythonPathForConfig();
// Start the server
const sessionIdPromise = (async () => {
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 3f82631f..4c47fba6 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -89,7 +89,10 @@ export function getExtensionVersion() {
}
// Returns whether a server of the current version is already running
-async function checkOrKillRunningServer(serverUrl: string): Promise<boolean> {
+async function checkOrKillRunningServer(
+ serverUrl: string,
+ deleteBinary: boolean
+): Promise<boolean> {
const serverRunning = await checkServerRunning(serverUrl);
let shouldKillAndReplace = true;
@@ -127,10 +130,13 @@ async function checkOrKillRunningServer(serverUrl: string): Promise<boolean> {
if (fs.existsSync(serverVersionPath())) {
fs.unlinkSync(serverVersionPath());
}
- // Also delete the server binary
- const serverBinary = serverBinaryPath();
- if (fs.existsSync(serverBinary)) {
- fs.unlinkSync(serverBinary);
+
+ if (deleteBinary) {
+ // Optionally, delete the server binary
+ const serverBinary = serverBinaryPath();
+ if (fs.existsSync(serverBinary)) {
+ fs.unlinkSync(serverBinary);
+ }
}
}
@@ -146,6 +152,17 @@ function ensureDirectoryExistence(filePath: string) {
fs.mkdirSync(dirname);
}
+function isPreviewExtension() {
+ // If the extension minor version is odd, it is a preview version
+ const extensionVersion = getExtensionVersion();
+ if (!extensionVersion || extensionVersion === "") {
+ return false;
+ }
+ const extensionVersionSplit = extensionVersion.split(".");
+ const extensionMinorVersion = extensionVersionSplit[1];
+ return parseInt(extensionMinorVersion) % 2 === 1;
+}
+
export async function downloadFromS3(
bucket: string,
fileName: string,
@@ -187,24 +204,84 @@ export async function downloadFromS3(
});
}
-export async function startContinuePythonServer(redownload: boolean = true) {
- // Check vscode settings
- const manuallyRunningServer =
- vscode.workspace
- .getConfiguration("continue")
- .get<boolean>("manuallyRunningServer") || false;
- const serverUrl = getContinueServerUrl();
- if (
- (serverUrl !== "http://localhost:65432" &&
- serverUrl !== "http://127.0.0.1:65432") ||
- manuallyRunningServer
- ) {
- console.log("Continue server is being run manually, skipping start");
- return;
- }
+function includedBinaryPath(): string {
+ const extensionPath = getExtensionUri().fsPath;
+ return path.join(
+ extensionPath,
+ "exe",
+ `run${os.platform() === "win32" ? ".exe" : ""}`
+ );
+}
+
+function runExecutable(path: string) {
+ console.log("---- Starting Continue server ----");
+ let attempts = 0;
+ let maxAttempts = 5;
+ let delay = 1000; // Delay between each attempt in milliseconds
+
+ const spawnChild = () => {
+ const retry = (e: any) => {
+ attempts++;
+ console.log(`Error caught: ${e}.\n\nRetrying attempt ${attempts}...`);
+ setTimeout(spawnChild, delay);
+ };
+ try {
+ // NodeJS bug requires not using detached on Windows, otherwise windowsHide is ineffective
+ // Otherwise, detach is preferable
+ const windowsSettings = {
+ windowsHide: true,
+ };
+ const macLinuxSettings = {
+ detached: true,
+ stdio: "ignore",
+ };
+ const settings: any =
+ os.platform() === "win32" ? windowsSettings : macLinuxSettings;
+ // Spawn the server
+ const child = spawn(path, settings);
+
+ // Either unref to avoid zombie process, or listen to events because you can
+ if (os.platform() === "win32") {
+ child.stdout.on("data", (data: any) => {
+ console.log(`stdout: ${data}`);
+ });
+ child.stderr.on("data", (data: any) => {
+ console.log(`stderr: ${data}`);
+ });
+ child.on("error", (err: any) => {
+ if (attempts < maxAttempts) {
+ retry(err);
+ } else {
+ console.error("Failed to start subprocess.", err);
+ }
+ });
+ child.on("exit", (code: any, signal: any) => {
+ console.log("Subprocess exited with code", code, signal);
+ });
+ child.on("close", (code: any, signal: any) => {
+ console.log("Subprocess closed with code", code, signal);
+ });
+ } else {
+ child.unref();
+ }
+ } catch (e: any) {
+ if (attempts < maxAttempts) {
+ retry(e);
+ } else {
+ throw e;
+ }
+ }
+ };
+
+ spawnChild();
+
+ // Write the current version of vscode extension to a file called server_version.txt
+ fs.writeFileSync(serverVersionPath(), getExtensionVersion());
+}
+async function setupWithS3Download(redownload: boolean, serverUrl: string) {
// Check if server is already running
- if (redownload && (await checkOrKillRunningServer(serverUrl))) {
+ if (redownload && (await checkOrKillRunningServer(serverUrl, true))) {
console.log("Continue server already running");
return;
}
@@ -263,7 +340,7 @@ export async function startContinuePythonServer(redownload: boolean = true) {
try {
await downloadFromS3(
bucket,
- fileName,
+ `${isPreviewExtension() ? "preview/" : ""}${fileName}`,
destination,
"us-west-1",
false
@@ -285,7 +362,7 @@ export async function startContinuePythonServer(redownload: boolean = true) {
try {
await downloadFromS3(
bucket,
- fileName,
+ `${isPreviewExtension() ? "preview/" : ""}${fileName}`,
destination,
"us-west-1",
true
@@ -342,67 +419,44 @@ export async function startContinuePythonServer(redownload: boolean = true) {
}
// Run the executable
- console.log("---- Starting Continue server ----");
- let attempts = 0;
- let maxAttempts = 5;
- let delay = 1000; // Delay between each attempt in milliseconds
+ runExecutable(destination);
+}
- const spawnChild = () => {
- const retry = (e: any) => {
- attempts++;
- console.log(`Error caught: ${e}.\n\nRetrying attempt ${attempts}...`);
- setTimeout(spawnChild, delay);
- };
- try {
- // NodeJS bug requires not using detached on Windows, otherwise windowsHide is ineffective
- // Otherwise, detach is preferable
- const windowsSettings = {
- windowsHide: true,
- };
- const macLinuxSettings = {
- detached: true,
- stdio: "ignore",
- };
- const settings: any =
- os.platform() === "win32" ? windowsSettings : macLinuxSettings;
- // Spawn the server
- const child = spawn(destination, settings);
+export async function startContinuePythonServer(redownload: boolean = true) {
+ // Check vscode settings for whether server is being run manually
+ const manuallyRunningServer =
+ vscode.workspace
+ .getConfiguration("continue")
+ .get<boolean>("manuallyRunningServer") || false;
+ const serverUrl = getContinueServerUrl();
+ if (
+ (serverUrl !== "http://localhost:65432" &&
+ serverUrl !== "http://127.0.0.1:65432") ||
+ manuallyRunningServer
+ ) {
+ console.log("Continue server is being run manually, skipping start");
+ return;
+ }
- // Either unref to avoid zombie process, or listen to events because you can
- if (os.platform() === "win32") {
- child.stdout.on("data", (data: any) => {
- console.log(`stdout: ${data}`);
- });
- child.stderr.on("data", (data: any) => {
- console.log(`stderr: ${data}`);
- });
- child.on("error", (err: any) => {
- if (attempts < maxAttempts) {
- retry(err);
- } else {
- console.error("Failed to start subprocess.", err);
- }
- });
- child.on("exit", (code: any, signal: any) => {
- console.log("Subprocess exited with code", code, signal);
- });
- child.on("close", (code: any, signal: any) => {
- console.log("Subprocess closed with code", code, signal);
- });
- } else {
- child.unref();
- }
- } catch (e: any) {
- if (attempts < maxAttempts) {
- retry(e);
- } else {
- throw e;
- }
- }
- };
+ // If on Apple Silicon, download binary from S3
+ // const isAppleSilicon = os.platform() === "darwin" && os.arch() === "arm64";
+ // if (isAppleSilicon) {
+ // await setupWithS3Download(redownload, serverUrl);
+ // return;
+ // }
- spawnChild();
+ // Check if current server version is already running
+ if (redownload && (await checkOrKillRunningServer(serverUrl, false))) {
+ console.log("Continue server already running");
+ return;
+ }
- // Write the current version of vscode extension to a file called server_version.txt
- fs.writeFileSync(serverVersionPath(), getExtensionVersion());
+ // Otherwise, use the binary installed with the extension
+ if (!fs.existsSync(includedBinaryPath())) {
+ throw new Error(
+ `Continue server binary not found at ${includedBinaryPath()}`
+ );
+ }
+
+ runExecutable(includedBinaryPath());
}
diff --git a/extension/src/commands.ts b/extension/src/commands.ts
index 4e2f4571..267f7e30 100644
--- a/extension/src/commands.ts
+++ b/extension/src/commands.ts
@@ -76,6 +76,7 @@ const commandsMap: { [command: string]: (...args: any) => any } = {
vscode.commands.executeCommand("workbench.action.toggleAuxiliaryBar");
},
"continue.quickTextEntry": async () => {
+ addHighlightedCodeToContext(true);
const text = await vscode.window.showInputBox({
placeHolder: "Ask a question or enter a slash command",
title: "Continue Quick Input",
@@ -100,6 +101,20 @@ const commandsMap: { [command: string]: (...args: any) => any } = {
vscode.commands.executeCommand("continue.continueGUIView.focus");
await ideProtocolClient.debugTerminal();
},
+
+ // Commands without keyboard shortcuts
+ "continue.addModel": () => {
+ vscode.commands.executeCommand("continue.continueGUIView.focus");
+ debugPanelWebview?.postMessage({
+ type: "addModel",
+ });
+ },
+ "continue.openSettingsUI": () => {
+ vscode.commands.executeCommand("continue.continueGUIView.focus");
+ debugPanelWebview?.postMessage({
+ type: "openSettings",
+ });
+ },
};
export function registerAllCommands(context: vscode.ExtensionContext) {
diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts
index c25dff50..342de769 100644
--- a/extension/src/continueIdeClient.ts
+++ b/extension/src/continueIdeClient.ts
@@ -148,32 +148,6 @@ class IdeProtocolClient {
const filepath = event.uri.fsPath;
const contents = event.getText();
this.messenger?.send("fileSaved", { filepath, contents });
-
- if (event.fileName.endsWith("config.py")) {
- if (
- this.context.globalState.get<boolean>(
- "continue.showConfigInfoMessage"
- ) !== false
- ) {
- vscode.window
- .showInformationMessage(
- "Reload the VS Code window for your changes to the Continue config to take effect.",
- "Reload",
- "Don't show again"
- )
- .then((selection) => {
- if (selection === "Don't show again") {
- // Get the global state
- context.globalState.update(
- "continue.showConfigInfoMessage",
- false
- );
- } else if (selection === "Reload") {
- vscode.commands.executeCommand("workbench.action.reloadWindow");
- }
- });
- }
- }
});
// Setup listeners for any selection changes in open editors
diff --git a/extension/src/lang-server/codeLens.ts b/extension/src/lang-server/codeLens.ts
index ec03f73e..6f36a6bd 100644
--- a/extension/src/lang-server/codeLens.ts
+++ b/extension/src/lang-server/codeLens.ts
@@ -4,6 +4,7 @@ import * as path from "path";
import * as os from "os";
import { DIFF_DIRECTORY, diffManager } from "../diffs";
import { getMetaKeyLabel } from "../util/util";
+import { debugPanelWebview } from "../debugPanel";
class SuggestionsCodeLensProvider implements vscode.CodeLensProvider {
public provideCodeLenses(
document: vscode.TextDocument,
@@ -82,8 +83,61 @@ class DiffViewerCodeLensProvider implements vscode.CodeLensProvider {
}
}
+class ConfigPyCodeLensProvider implements vscode.CodeLensProvider {
+ public provideCodeLenses(
+ document: vscode.TextDocument,
+ _: vscode.CancellationToken
+ ): vscode.CodeLens[] | Thenable<vscode.CodeLens[]> {
+ const codeLenses: vscode.CodeLens[] = [];
+
+ if (
+ !document.uri.fsPath.endsWith(".continue/config.py") &&
+ !document.uri.fsPath.endsWith(".continue\\config.py")
+ ) {
+ return codeLenses;
+ }
+
+ const lines = document.getText().split(os.EOL);
+ const lineOfModels = lines.findIndex((line) =>
+ line.includes("models=Models(")
+ );
+
+ if (lineOfModels >= 0) {
+ const range = new vscode.Range(lineOfModels, 0, lineOfModels + 1, 0);
+ codeLenses.push(
+ new vscode.CodeLens(range, {
+ title: `+ Add a Model`,
+ command: "continue.addModel",
+ })
+ );
+ }
+
+ const lineOfSystemMessage = lines.findIndex((line) =>
+ line.replace(" ", "").includes("config=ContinueConfig(")
+ );
+
+ if (lineOfSystemMessage >= 0) {
+ const range = new vscode.Range(
+ lineOfSystemMessage,
+ 0,
+ lineOfSystemMessage + 1,
+ 0
+ );
+ codeLenses.push(
+ new vscode.CodeLens(range, {
+ title: `✏️ Edit in UI`,
+ command: "continue.openSettingsUI",
+ })
+ );
+ }
+
+ return codeLenses;
+ }
+}
+
let diffsCodeLensDisposable: vscode.Disposable | undefined = undefined;
let suggestionsCodeLensDisposable: vscode.Disposable | undefined = undefined;
+let configPyCodeLensDisposable: vscode.Disposable | undefined = undefined;
export function registerAllCodeLensProviders(context: vscode.ExtensionContext) {
if (suggestionsCodeLensDisposable) {
@@ -92,6 +146,9 @@ export function registerAllCodeLensProviders(context: vscode.ExtensionContext) {
if (diffsCodeLensDisposable) {
diffsCodeLensDisposable.dispose();
}
+ if (configPyCodeLensDisposable) {
+ configPyCodeLensDisposable.dispose();
+ }
suggestionsCodeLensDisposable = vscode.languages.registerCodeLensProvider(
"*",
new SuggestionsCodeLensProvider()
@@ -100,6 +157,11 @@ export function registerAllCodeLensProviders(context: vscode.ExtensionContext) {
"*",
new DiffViewerCodeLensProvider()
);
+ configPyCodeLensDisposable = vscode.languages.registerCodeLensProvider(
+ "*",
+ new ConfigPyCodeLensProvider()
+ );
context.subscriptions.push(suggestionsCodeLensDisposable);
context.subscriptions.push(diffsCodeLensDisposable);
+ context.subscriptions.push(configPyCodeLensDisposable);
}
diff --git a/extension/src/test-suite/environmentSetup.test.ts b/extension/src/test-suite/environmentSetup.test.ts
index 1c5fe97e..dd371ab1 100644
--- a/extension/src/test-suite/environmentSetup.test.ts
+++ b/extension/src/test-suite/environmentSetup.test.ts
@@ -6,8 +6,8 @@ import { startContinuePythonServer } from "../activation/environmentSetup";
import fetch from "node-fetch";
describe("Can start python server", () => {
- test("Can start python server in under 35 seconds", async function () {
- const allowedTime = 60_000;
+ test("Can start python server in under 80 seconds", async function () {
+ const allowedTime = 80_000;
this.timeout(allowedTime + 10_000);
console.log("Starting server in test...");
diff --git a/extension/src/util/messenger.ts b/extension/src/util/messenger.ts
index 152d4a1f..29b38497 100644
--- a/extension/src/util/messenger.ts
+++ b/extension/src/util/messenger.ts
@@ -55,6 +55,15 @@ export class WebsocketMessenger extends Messenger {
this.onMessageType(messageType, listener);
}
}
+
+ newWebsocket.addEventListener("open", () => console.log("Websocket connection opened"));
+ newWebsocket.addEventListener("error", (error: any) => {
+ console.error("Websocket error occurred: ", error);
+ });
+ newWebsocket.addEventListener("close", (error: any) => {
+ console.log("Websocket connection closed: ", error);
+ });
+
return newWebsocket;
}
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-02-08 15:24:21 +0000