From 9168219b829aab55fefcb114937d3fc196548cde Mon Sep 17 00:00:00 2001 From: Tuowen Zhao Date: Wed, 18 Oct 2023 23:02:37 -0700 Subject: Cleanup --- extension/src/activation/activate.ts | 2 +- extension/src/activation/environmentSetup.ts | 4 ++-- extension/src/bridge.ts | 2 +- extension/src/commands.ts | 34 ++++++++++++++-------------- extension/src/continueIdeClient.ts | 2 +- extension/src/debugPanel.ts | 8 +++---- extension/src/extension.ts | 2 +- extension/src/lang-server/codeLens.ts | 14 ++++++------ extension/src/util/vscode.ts | 2 +- 9 files changed, 35 insertions(+), 35 deletions(-) (limited to 'extension/src') diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts index edd13137..91c8a989 100644 --- a/extension/src/activation/activate.ts +++ b/extension/src/activation/activate.ts @@ -92,7 +92,7 @@ export async function activateExtension(context: vscode.ExtensionContext) { context.subscriptions.push( vscode.window.registerWebviewViewProvider( - "continue.continueGUIView", + "sncontinue.continueGUIView", provider, { webviewOptions: { retainContextWhenHidden: true }, diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts index 4c47fba6..75a0d83a 100644 --- a/extension/src/activation/environmentSetup.ts +++ b/extension/src/activation/environmentSetup.ts @@ -84,7 +84,7 @@ function serverBinaryPath(): string { } export function getExtensionVersion() { - const extension = vscode.extensions.getExtension("continue.continue"); + const extension = vscode.extensions.getExtension("sambanova.sncontinue"); return extension?.packageJSON.version || ""; } @@ -426,7 +426,7 @@ export async function startContinuePythonServer(redownload: boolean = true) { // Check vscode settings for whether server is being run manually const manuallyRunningServer = vscode.workspace - .getConfiguration("continue") + .getConfiguration("sncontinue") .get("manuallyRunningServer") || false; const serverUrl = getContinueServerUrl(); if ( diff --git a/extension/src/bridge.ts b/extension/src/bridge.ts index 8253cbab..d621b0d0 100644 --- a/extension/src/bridge.ts +++ b/extension/src/bridge.ts @@ -7,7 +7,7 @@ export function getContinueServerUrl() { } return ( - vscode.workspace.getConfiguration("continue").get("serverUrl") || + vscode.workspace.getConfiguration("sncontinue").get("serverUrl") || "http://localhost:65432" ); } diff --git a/extension/src/commands.ts b/extension/src/commands.ts index 267f7e30..1796748b 100644 --- a/extension/src/commands.ts +++ b/extension/src/commands.ts @@ -45,37 +45,37 @@ export const setFocusedOnContinueInput = (value: boolean) => { // Copy everything over from extension.ts const commandsMap: { [command: string]: (...args: any) => any } = { - "continue.acceptDiff": acceptDiffCommand, - "continue.rejectDiff": rejectDiffCommand, - "continue.quickFix": async (message: string, code: string, edit: boolean) => { + "sncontinue.acceptDiff": acceptDiffCommand, + "sncontinue.rejectDiff": rejectDiffCommand, + "sncontinue.quickFix": async (message: string, code: string, edit: boolean) => { ideProtocolClient.sendMainUserInput( `${ edit ? "/edit " : "" }${code}\n\nHow do I fix this problem in the above code?: ${message}` ); if (!edit) { - vscode.commands.executeCommand("continue.continueGUIView.focus"); + vscode.commands.executeCommand("sncontinue.continueGUIView.focus"); } }, - "continue.focusContinueInput": async () => { - vscode.commands.executeCommand("continue.continueGUIView.focus"); + "sncontinue.focusContinueInput": async () => { + vscode.commands.executeCommand("sncontinue.continueGUIView.focus"); debugPanelWebview?.postMessage({ type: "focusContinueInput", }); addHighlightedCodeToContext(false); }, - "continue.focusContinueInputWithEdit": async () => { - vscode.commands.executeCommand("continue.continueGUIView.focus"); + "sncontinue.focusContinueInputWithEdit": async () => { + vscode.commands.executeCommand("sncontinue.continueGUIView.focus"); addHighlightedCodeToContext(true); debugPanelWebview?.postMessage({ type: "focusContinueInputWithEdit", }); focusedOnContinueInput = true; }, - "continue.toggleAuxiliaryBar": () => { + "sncontinue.toggleAuxiliaryBar": () => { vscode.commands.executeCommand("workbench.action.toggleAuxiliaryBar"); }, - "continue.quickTextEntry": async () => { + "sncontinue.quickTextEntry": async () => { addHighlightedCodeToContext(true); const text = await vscode.window.showInputBox({ placeHolder: "Ask a question or enter a slash command", @@ -85,7 +85,7 @@ const commandsMap: { [command: string]: (...args: any) => any } = { ideProtocolClient.sendMainUserInput(text); } }, - "continue.viewLogs": async () => { + "sncontinue.viewLogs": async () => { // Open ~/.continue/continue.log const logFile = path.join(os.homedir(), ".continue", "continue.log"); // Make sure the file/directory exist @@ -97,20 +97,20 @@ const commandsMap: { [command: string]: (...args: any) => any } = { const uri = vscode.Uri.file(logFile); await vscode.window.showTextDocument(uri); }, - "continue.debugTerminal": async () => { - vscode.commands.executeCommand("continue.continueGUIView.focus"); + "sncontinue.debugTerminal": async () => { + vscode.commands.executeCommand("sncontinue.continueGUIView.focus"); await ideProtocolClient.debugTerminal(); }, // Commands without keyboard shortcuts - "continue.addModel": () => { - vscode.commands.executeCommand("continue.continueGUIView.focus"); + "sncontinue.addModel": () => { + vscode.commands.executeCommand("sncontinue.continueGUIView.focus"); debugPanelWebview?.postMessage({ type: "addModel", }); }, - "continue.openSettingsUI": () => { - vscode.commands.executeCommand("continue.continueGUIView.focus"); + "sncontinue.openSettingsUI": () => { + vscode.commands.executeCommand("sncontinue.continueGUIView.focus"); debugPanelWebview?.postMessage({ type: "openSettings", }); diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts index 342de769..7cf41448 100644 --- a/extension/src/continueIdeClient.ts +++ b/extension/src/continueIdeClient.ts @@ -204,7 +204,7 @@ class IdeProtocolClient { // Listen for changes to settings.json vscode.workspace.onDidChangeConfiguration((event) => { - if (event.affectsConfiguration("continue")) { + if (event.affectsConfiguration("sncontinue")) { vscode.window .showInformationMessage( "Please reload VS Code for changes to Continue settings to take effect.", diff --git a/extension/src/debugPanel.ts b/extension/src/debugPanel.ts index 961eb150..fe0e0637 100644 --- a/extension/src/debugPanel.ts +++ b/extension/src/debugPanel.ts @@ -192,7 +192,7 @@ export function setupDebugPanel( sessionId, vscMediaUrl, dataSwitchOn: vscode.workspace - .getConfiguration("continue") + .getConfiguration("sncontinue") .get("dataSwitch"), }); break; @@ -200,7 +200,7 @@ export function setupDebugPanel( case "toggleDataSwitch": { // Set the setting in vscode await vscode.workspace - .getConfiguration("continue") + .getConfiguration("sncontinue") .update("dataSwitch", data.on, vscode.ConfigurationTarget.Global); break; } @@ -248,7 +248,7 @@ export function setupDebugPanel( } case "toggleDevTools": { vscode.commands.executeCommand("workbench.action.toggleDevTools"); - vscode.commands.executeCommand("continue.viewLogs"); + vscode.commands.executeCommand("sncontinue.viewLogs"); break; } case "reloadWindow": { @@ -321,7 +321,7 @@ export function setupDebugPanel( export class ContinueGUIWebviewViewProvider implements vscode.WebviewViewProvider { - public static readonly viewType = "continue.continueGUIView"; + public static readonly viewType = "sncontinue.continueGUIView"; private readonly sessionIdPromise: Promise; constructor(sessionIdPromise: Promise) { diff --git a/extension/src/extension.ts b/extension/src/extension.ts index 0b6faa5c..8f497282 100644 --- a/extension/src/extension.ts +++ b/extension/src/extension.ts @@ -43,7 +43,7 @@ async function dynamicImportAndActivate(context: vscode.ExtensionContext) { ) .then((selection) => { if (selection === "View Logs") { - vscode.commands.executeCommand("continue.viewLogs"); + vscode.commands.executeCommand("sncontinue.viewLogs"); } else if (selection === "Retry") { // Reload VS Code window vscode.commands.executeCommand("workbench.action.reloadWindow"); diff --git a/extension/src/lang-server/codeLens.ts b/extension/src/lang-server/codeLens.ts index 6f36a6bd..5b2e4d99 100644 --- a/extension/src/lang-server/codeLens.ts +++ b/extension/src/lang-server/codeLens.ts @@ -25,12 +25,12 @@ class SuggestionsCodeLensProvider implements vscode.CodeLensProvider { codeLenses.push( new vscode.CodeLens(range, { title: "Accept ✅", - command: "continue.acceptSuggestion", + command: "sncontinue.acceptSuggestion", arguments: [suggestion], }), new vscode.CodeLens(range, { title: "Reject ❌", - command: "continue.rejectSuggestion", + command: "sncontinue.rejectSuggestion", arguments: [suggestion], }) ); @@ -63,17 +63,17 @@ class DiffViewerCodeLensProvider implements vscode.CodeLensProvider { codeLenses.push( new vscode.CodeLens(range, { title: `Accept All ✅ (${getMetaKeyLabel()}⇧↩)`, - command: "continue.acceptDiff", + command: "sncontinue.acceptDiff", arguments: [document.uri.fsPath], }), new vscode.CodeLens(range, { title: `Reject All ❌ (${getMetaKeyLabel()}⇧⌫)`, - command: "continue.rejectDiff", + command: "sncontinue.rejectDiff", arguments: [document.uri.fsPath], }), new vscode.CodeLens(range, { title: `Further Edit ✏️ (${getMetaKeyLabel()}⇧M)`, - command: "continue.focusContinueInputWithEdit", + command: "sncontinue.focusContinueInputWithEdit", }) ); return codeLenses; @@ -107,7 +107,7 @@ class ConfigPyCodeLensProvider implements vscode.CodeLensProvider { codeLenses.push( new vscode.CodeLens(range, { title: `+ Add a Model`, - command: "continue.addModel", + command: "sncontinue.addModel", }) ); } @@ -126,7 +126,7 @@ class ConfigPyCodeLensProvider implements vscode.CodeLensProvider { codeLenses.push( new vscode.CodeLens(range, { title: `✏️ Edit in UI`, - command: "continue.openSettingsUI", + command: "sncontinue.openSettingsUI", }) ); } diff --git a/extension/src/util/vscode.ts b/extension/src/util/vscode.ts index 92bbc110..1e7c9a6d 100644 --- a/extension/src/util/vscode.ts +++ b/extension/src/util/vscode.ts @@ -21,7 +21,7 @@ export function getNonce() { } export function getExtensionUri(): vscode.Uri { - return vscode.extensions.getExtension("Continue.continue")!.extensionUri; + return vscode.extensions.getExtension("Sambanova.sncontinue")!.extensionUri; } export function getViewColumnOfFile( -- cgit v1.2.3-70-g09d2