summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--continuedev/src/continuedev/server/ide.py9
-rw-r--r--extension/package-lock.json4
-rw-r--r--extension/package.json2
-rw-r--r--extension/src/activation/activate.ts12
-rw-r--r--extension/src/activation/environmentSetup.ts1
5 files changed, 17 insertions, 11 deletions
diff --git a/continuedev/src/continuedev/server/ide.py b/continuedev/src/continuedev/server/ide.py
index cf8b32a1..87374928 100644
--- a/continuedev/src/continuedev/server/ide.py
+++ b/continuedev/src/continuedev/server/ide.py
@@ -154,6 +154,7 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
async def _send_json(self, message_type: str, data: Any):
if self.websocket.application_state == WebSocketState.DISCONNECTED:
+ print("Tried to send message, but websocket is disconnected", message_type)
return
print("Sending IDE message: ", message_type)
await self.websocket.send_json({
@@ -435,6 +436,10 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
@router.websocket("/ws")
async def websocket_endpoint(websocket: WebSocket, session_id: str = None):
try:
+ await websocket.accept()
+ print("Accepted websocket connection from, ", websocket.client)
+ await websocket.send_json({"messageType": "connected", "data": {}})
+
# Start meilisearch
try:
await start_meilisearch()
@@ -442,10 +447,6 @@ async def websocket_endpoint(websocket: WebSocket, session_id: str = None):
print("Failed to start MeiliSearch")
print(e)
- await websocket.accept()
- print("Accepted websocket connection from, ", websocket.client)
- await websocket.send_json({"messageType": "connected", "data": {}})
-
def handle_msg(msg):
message = json.loads(msg)
diff --git a/extension/package-lock.json b/extension/package-lock.json
index e9427531..fcd97d50 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "continue",
- "version": "0.0.212",
+ "version": "0.0.213",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "continue",
- "version": "0.0.212",
+ "version": "0.0.213",
"license": "Apache-2.0",
"dependencies": {
"@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 92d02f6b..e1004a8c 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.212",
+ "version": "0.0.213",
"publisher": "Continue",
"engines": {
"vscode": "^1.67.0"
diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index 40f1bbd5..8bdc7e21 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -22,10 +22,14 @@ function getExtensionVersionInt(versionString: string): number {
export async function activateExtension(context: vscode.ExtensionContext) {
extensionContext = context;
console.log("Using Continue version: ", getExtensionVersion());
- console.log(
- "In workspace: ",
- vscode.workspace.workspaceFolders?.[0].uri.fsPath
- );
+ try {
+ console.log(
+ "In workspace: ",
+ vscode.workspace.workspaceFolders?.[0].uri.fsPath
+ );
+ } 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 respository for now.
fetch(PACKAGE_JSON_RAW_GITHUB_URL)
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index c8998bee..44fb3b60 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -430,6 +430,7 @@ export async function startContinuePythonServer() {
setupServerPath();
return await retryThenFail(async () => {
+ console.log("Checking if server is old version");
// Kill the server if it is running an old version
if (fs.existsSync(serverVersionPath())) {
const serverVersion = fs.readFileSync(serverVersionPath(), "utf8");