Skip to content

Sync state with app #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nang-dev merged 3 commits into from
Feb 21, 2025
Merged

Sync state with app #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00256ff
Changed webview name
nang-dev Feb 20, 2025
f3f0697
Added send to app
nang-dev Feb 20, 2025
d6477e3
Reverted some files
nang-dev Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"pearai-roo-cline": [
{
"type": "webview",
"id": "roo-cline.SidebarProvider",
"id": "pearai-roo-cline.SidebarProvider",
"name": ""
}
]
Expand Down Expand Up @@ -157,32 +157,32 @@
{
"command": "roo-cline.plusButtonClicked",
"group": "navigation@1",
"when": "view == roo-cline.SidebarProvider"
"when": "view == pearai-roo-cline.SidebarProvider"
},
{
"command": "roo-cline.promptsButtonClicked",
"group": "navigation@2",
"when": "view == roo-cline.SidebarProvider"
"when": "view == pearai-roo-cline.SidebarProvider"
},
{
"command": "roo-cline.mcpButtonClicked",
"group": "navigation@3",
"when": "view == roo-cline.SidebarProvider"
"when": "view == pearai-roo-cline.SidebarProvider"
},
{
"command": "roo-cline.historyButtonClicked",
"group": "navigation@4",
"when": "view == roo-cline.SidebarProvider"
"when": "view == pearai-roo-cline.SidebarProvider"
},
{
"command": "roo-cline.popoutButtonClicked",
"group": "navigation@5",
"when": "view == roo-cline.SidebarProvider"
"when": "view == pearai-roo-cline.SidebarProvider"
},
{
"command": "roo-cline.settingsButtonClicked",
"group": "navigation@6",
"when": "view == roo-cline.SidebarProvider"
"when": "view == pearai-roo-cline.SidebarProvider"
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions src/core/webview/ClineProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export const GlobalFileNames = {
}

export class ClineProvider implements vscode.WebviewViewProvider {
public static readonly sideBarId = "roo-cline.SidebarProvider" // used in package.json as the view's id. This value cannot be changed due to how vscode caches views based on their id, and updating the id would break existing instances of the extension.
public static readonly sideBarId = "pearai-roo-cline.SidebarProvider" // used in package.json as the view's id. This value cannot be changed due to how vscode caches views based on their id, and updating the id would break existing instances of the extension.
public static readonly tabPanelId = "roo-cline.TabPanelProvider"
private static activeInstances: Set<ClineProvider> = new Set()
private disposables: vscode.Disposable[] = []
Expand Down Expand Up @@ -204,7 +204,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {

// If no visible provider, try to show the sidebar view
if (!visibleProvider) {
await vscode.commands.executeCommand("roo-cline.SidebarProvider.focus")
await vscode.commands.executeCommand("pearai-roo-cline.SidebarProvider.focus")
// Wait briefly for the view to become visible
await delay(100)
visibleProvider = ClineProvider.getVisibleInstance()
Expand Down
9 changes: 8 additions & 1 deletion src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,14 @@ export function activate(context: vscode.ExtensionContext) {

context.subscriptions.push(
vscode.commands.registerCommand("roo-cline.focus", async (...args: any[]) => {
await vscode.commands.executeCommand("roo-cline.SidebarProvider.focus")
try {
await vscode.commands.executeCommand("workbench.action.switchToPearAIIntegrationIconBar", {
view: "agent",
})
} catch (error) {
// Silently handle any errors that might occur when switching to the integration bar
}
await vscode.commands.executeCommand("pearai-roo-cline.SidebarProvider.focus")
}),
)

Expand Down
Loading