summaryrefslogtreecommitdiff
path: root/extension
diff options
context:
space:
mode:
Diffstat (limited to 'extension')
-rw-r--r--extension/README.md4
-rw-r--r--extension/package-lock.json4
-rw-r--r--extension/package.json2
-rw-r--r--extension/react-app/src/components/ComboBox.tsx58
-rw-r--r--extension/react-app/src/hooks/ContinueGUIClientProtocol.ts7
-rw-r--r--extension/react-app/src/hooks/messenger.ts10
-rw-r--r--extension/react-app/src/hooks/vscodeMessenger.ts8
-rw-r--r--extension/src/activation/activate.ts19
-rw-r--r--extension/src/activation/environmentSetup.ts14
-rw-r--r--extension/src/continueIdeClient.ts7
-rw-r--r--extension/src/debugPanel.ts38
11 files changed, 124 insertions, 47 deletions
diff --git a/extension/README.md b/extension/README.md
index acb9e097..55f8eeaa 100644
--- a/extension/README.md
+++ b/extension/README.md
@@ -2,6 +2,8 @@
**[Continue](https://continue.dev/docs) is the open-source autopilot for software development—a [VS Code extension](https://marketplace.visualstudio.com/items?itemName=Continue.continue) that brings the power of ChatGPT to your IDE**
+![Editing with Continue](https://github.com/continuedev/continue/blob/main/readme.gif?raw=true)
+
## Task, not tab, auto-complete
### Get possible explainations
@@ -41,6 +43,8 @@ If your Continue server is not setting up, please check the console logs:
3. Select `Console`
4. Read the console logs
+\*The Continue VS Code extension is currently in beta. It will attempt to start the Continue Python server locally for you, but if this fails you can run the server manually as is explained here: [Running the Continue server manually](https://continue.dev/docs/how-continue-works)
+
## License
[Apache 2.0 © 2023 Continue Dev, Inc.](./LICENSE)
diff --git a/extension/package-lock.json b/extension/package-lock.json
index fcd97d50..6f289260 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "continue",
- "version": "0.0.213",
+ "version": "0.0.227",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "continue",
- "version": "0.0.213",
+ "version": "0.0.227",
"license": "Apache-2.0",
"dependencies": {
"@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index e1004a8c..5d0ccad2 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -14,7 +14,7 @@
"displayName": "Continue",
"pricing": "Free",
"description": "The open-source coding autopilot",
- "version": "0.0.213",
+ "version": "0.0.227",
"publisher": "Continue",
"engines": {
"vscode": "^1.67.0"
diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx
index 9aab4e93..da559383 100644
--- a/extension/react-app/src/components/ComboBox.tsx
+++ b/extension/react-app/src/components/ComboBox.tsx
@@ -162,33 +162,43 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
}
},
onInputValueChange({ inputValue, highlightedIndex }) {
- if (!inputValue) return;
+ if (!inputValue) {
+ setItems([]);
+ return;
+ }
props.onInputValueChange(inputValue);
if (inputValue.endsWith("@") || currentlyInContextQuery) {
- setCurrentlyInContextQuery(true);
-
const segs = inputValue.split("@");
- const providerAndQuery = segs[segs.length - 1];
- const [provider, query] = providerAndQuery.split(" ");
- searchClient
- .index(SEARCH_INDEX_NAME)
- .search(providerAndQuery)
- .then((res) => {
- setItems(
- res.hits.map((hit) => {
- return {
- name: hit.name,
- description: hit.description,
- id: hit.id,
- };
- })
- );
- })
- .catch(() => {
- // Swallow errors, because this simply is not supported on Windows at the moment
- });
- return;
+
+ if (segs.length > 1) {
+ // Get search results and return
+ setCurrentlyInContextQuery(true);
+ const providerAndQuery = segs[segs.length - 1];
+ const [provider, query] = providerAndQuery.split(" ");
+ searchClient
+ .index(SEARCH_INDEX_NAME)
+ .search(providerAndQuery)
+ .then((res) => {
+ setItems(
+ res.hits.map((hit) => {
+ return {
+ name: hit.name,
+ description: hit.description,
+ id: hit.id,
+ };
+ })
+ );
+ })
+ .catch(() => {
+ // Swallow errors, because this simply is not supported on Windows at the moment
+ });
+ return;
+ } else {
+ // Exit the '@' context menu
+ setCurrentlyInContextQuery(false);
+ setItems;
+ }
}
setItems(
props.items.filter((item) =>
@@ -262,7 +272,7 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
key={`${item.description.id.item_id}${idx}`}
item={item}
warning={
- false && item.content.length > 4000 && item.editing
+ item.content.length > 4000 && item.editing
? "Editing such a large range may be slow"
: undefined
}
diff --git a/extension/react-app/src/hooks/ContinueGUIClientProtocol.ts b/extension/react-app/src/hooks/ContinueGUIClientProtocol.ts
index b8019664..5a5d4c30 100644
--- a/extension/react-app/src/hooks/ContinueGUIClientProtocol.ts
+++ b/extension/react-app/src/hooks/ContinueGUIClientProtocol.ts
@@ -17,6 +17,13 @@ class ContinueGUIClientProtocol extends AbstractContinueGUIClientProtocol {
this.messenger = useVscodeMessagePassing
? new VscodeMessenger(serverUrlWithSessionId)
: new WebsocketMessenger(serverUrlWithSessionId);
+
+ this.messenger.onClose(() => {
+ console.log("GUI -> IDE websocket closed");
+ });
+ this.messenger.onError((error) => {
+ console.log("GUI -> IDE websocket error", error);
+ });
}
sendMainInput(input: string) {
diff --git a/extension/react-app/src/hooks/messenger.ts b/extension/react-app/src/hooks/messenger.ts
index 00ce1fbb..ecf646c7 100644
--- a/extension/react-app/src/hooks/messenger.ts
+++ b/extension/react-app/src/hooks/messenger.ts
@@ -13,6 +13,8 @@ export abstract class Messenger {
abstract onClose(callback: () => void): void;
abstract sendAndReceive(messageType: string, data: any): Promise<any>;
+
+ abstract onError(callback: (error: any) => void): void;
}
export class WebsocketMessenger extends Messenger {
@@ -20,6 +22,7 @@ export class WebsocketMessenger extends Messenger {
private onMessageListeners: {
[messageType: string]: ((data: object) => void)[];
} = {};
+ private onErrorListeners: ((error: any) => void)[] = [];
private onOpenListeners: (() => void)[] = [];
private onCloseListeners: (() => void)[] = [];
private serverUrl: string;
@@ -37,6 +40,9 @@ export class WebsocketMessenger extends Messenger {
this.onMessageType(messageType, listener);
}
}
+ for (const listener of this.onErrorListeners) {
+ this.onError(listener);
+ }
return newWebsocket;
}
@@ -95,4 +101,8 @@ export class WebsocketMessenger extends Messenger {
onClose(callback: () => void): void {
this.websocket.addEventListener("close", callback);
}
+
+ onError(callback: (error: any) => void): void {
+ this.websocket.addEventListener("error", callback);
+ }
}
diff --git a/extension/react-app/src/hooks/vscodeMessenger.ts b/extension/react-app/src/hooks/vscodeMessenger.ts
index ba19586b..13f5092b 100644
--- a/extension/react-app/src/hooks/vscodeMessenger.ts
+++ b/extension/react-app/src/hooks/vscodeMessenger.ts
@@ -38,6 +38,14 @@ export class VscodeMessenger extends Messenger {
});
}
+ onError(callback: (error: any) => void): void {
+ window.addEventListener("message", (event: any) => {
+ if (event.data.type === "websocketForwardingError") {
+ callback(event.data.error);
+ }
+ });
+ }
+
sendAndReceive(messageType: string, data: any): Promise<any> {
return new Promise((resolve) => {
const handler = (event: any) => {
diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index 8bdc7e21..a47d5e97 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -7,6 +7,9 @@ import {
startContinuePythonServer,
} from "./environmentSetup";
import fetch from "node-fetch";
+import { registerAllCodeLensProviders } from "../lang-server/codeLens";
+import { registerAllCommands } from "../commands";
+import registerQuickFixProvider from "../lang-server/codeActions";
const PACKAGE_JSON_RAW_GITHUB_URL =
"https://raw.githubusercontent.com/continuedev/continue/HEAD/extension/package.json";
@@ -46,6 +49,11 @@ export async function activateExtension(context: vscode.ExtensionContext) {
})
.catch((e) => console.log("Error checking for extension updates: ", e));
+ // Register commands and providers
+ registerAllCodeLensProviders(context);
+ registerAllCommands(context);
+ registerQuickFixProvider();
+
// Start the server and display loader if taking > 2 seconds
const sessionIdPromise = (async () => {
await new Promise((resolve) => {
@@ -78,6 +86,17 @@ export async function activateExtension(context: vscode.ExtensionContext) {
return Promise.resolve();
}
);
+
+ vscode.window
+ .showInformationMessage(
+ "Click here to view the server logs, or use the 'continue.viewLogs' VS Code command.",
+ "View Logs"
+ )
+ .then((selection) => {
+ if (selection === "View Logs") {
+ vscode.commands.executeCommand("continue.viewLogs");
+ }
+ });
}
}, 2000);
});
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 44fb3b60..50a2783a 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -463,15 +463,13 @@ export async function startContinuePythonServer() {
const command = `cd "${serverPath()}" && ${activateCmd} && cd .. && ${pythonCmd} -m server.run_continue_server`;
- console.log("Starting Continue python server...");
-
return new Promise(async (resolve, reject) => {
+ console.log("Starting Continue python server...");
try {
const child = spawn(command, {
shell: true,
});
child.stderr.on("data", (data: any) => {
- console.log(`stdout: ${data}`);
if (
data.includes("Uvicorn running on") || // Successfully started the server
data.includes("only one usage of each socket address") || // [windows] The server is already running (probably a simultaneously opened VS Code window)
@@ -481,12 +479,22 @@ export async function startContinuePythonServer() {
resolve(null);
} else if (data.includes("ERROR") || data.includes("Traceback")) {
console.log("Error starting Continue python server: ", data);
+ } else {
+ console.log(`stdout: ${data}`);
}
});
child.on("error", (error: any) => {
console.log(`error: ${error.message}`);
});
+ child.on("close", (code: any) => {
+ console.log(`child process exited with code ${code}`);
+ });
+
+ child.stdout.on("data", (data: any) => {
+ console.log(`stdout: ${data}`);
+ });
+
// Write the current version of vscode to a file called server_version.txt
fs.writeFileSync(serverVersionPath(), getExtensionVersion());
} catch (e) {
diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts
index 157b59cb..498cf9de 100644
--- a/extension/src/continueIdeClient.ts
+++ b/extension/src/continueIdeClient.ts
@@ -62,9 +62,11 @@ class IdeProtocolClient {
this._lastReloadTime = Math.min(2 * this._lastReloadTime, 5000);
};
messenger.onOpen(() => {
+ console.log("IDE protocol websocket opened");
this._reconnectionTimeouts.forEach((to) => clearTimeout(to));
});
messenger.onClose(() => {
+ console.log("IDE protocol websocket closed");
reconnect();
});
messenger.onError(() => {
@@ -91,11 +93,6 @@ class IdeProtocolClient {
this._serverUrl = serverUrl;
this._newWebsocketMessenger();
- // Register commands and providers
- registerAllCodeLensProviders(context);
- registerAllCommands(context);
- registerQuickFixProvider();
-
// Setup listeners for any file changes in open editors
// vscode.workspace.onDidChangeTextDocument((event) => {
// if (this._makingEdit === 0) {
diff --git a/extension/src/debugPanel.ts b/extension/src/debugPanel.ts
index 3c4f8481..643563a2 100644
--- a/extension/src/debugPanel.ts
+++ b/extension/src/debugPanel.ts
@@ -17,17 +17,20 @@ class WebsocketConnection {
private _onMessage: (message: string) => void;
private _onOpen: () => void;
private _onClose: () => void;
+ private _onError: (e: any) => void;
constructor(
url: string,
onMessage: (message: string) => void,
onOpen: () => void,
- onClose: () => void
+ onClose: () => void,
+ onError: (e: any) => void
) {
this._ws = new WebSocket(url);
this._onMessage = onMessage;
this._onOpen = onOpen;
this._onClose = onClose;
+ this._onError = onError;
this._ws.addEventListener("message", (event) => {
this._onMessage(event.data);
@@ -38,6 +41,9 @@ class WebsocketConnection {
this._ws.addEventListener("open", () => {
this._onOpen();
});
+ this._ws.addEventListener("error", (e: any) => {
+ this._onError(e);
+ });
}
public send(message: string) {
@@ -147,12 +153,20 @@ export function setupDebugPanel(
url,
});
};
+ const onError = (e: any) => {
+ panel.webview.postMessage({
+ type: "websocketForwardingError",
+ url,
+ error: e,
+ });
+ };
try {
const connection = new WebsocketConnection(
url,
onMessage,
onOpen,
- onClose
+ onClose,
+ onError
);
websocketConnections[url] = connection;
resolve(null);
@@ -197,6 +211,15 @@ export function setupDebugPanel(
let url = data.url;
if (typeof websocketConnections[url] === "undefined") {
await connectWebsocket(url);
+ } else {
+ console.log(
+ "Websocket connection requested by GUI already open at",
+ url
+ );
+ panel.webview.postMessage({
+ type: "websocketForwardingOpen",
+ url,
+ });
}
break;
}
@@ -249,16 +272,7 @@ export function setupDebugPanel(
});
}
);
- vscode.window
- .showInformationMessage(
- "Click here to view the server logs, or use the 'continue.viewLogs' VS Code command.",
- "View Logs"
- )
- .then((selection) => {
- if (selection === "View Logs") {
- vscode.commands.executeCommand("continue.viewLogs");
- }
- });
+
break;
}
}
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-02-10 23:57:32 +0000