Skip to content
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

Nang changes #178

Open
wants to merge 1 commit into
base: disable-composite-bar
Choose a base branch
from
Open

Nang changes #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion extensions/pearai-submodule
Open in desktop
Submodule pearai-submodule updated 139 files
6 changes: 3 additions & 3 deletions scripts/code.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
set -e

# Comment out if pearai submodule does not need to be recompiled. Speeds things up.
cd extensions/pearai-submodule
./scripts/install-and-build.sh
cd ../..
# cd extensions/pearai-submodule
# ./scripts/install-and-build.sh
# cd ../..

if [[ "$OSTYPE" == "darwin"* ]]; then
realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/api/browser/viewsExtensionPoint.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const viewsContainersContribution: IJSONSchema = {
items: viewsContainerSchema
},
"auxiliarybar": {
description: localize('views.container.auxiliarybar', "Contribute views containers to Secondary Side Bar"),
description: localize('views.container.auxiliarybar', "Contribute views containers to PearAI Side Bar"),
type: 'array',
items: viewsContainerSchema
}
Expand Down
12 changes: 6 additions & 6 deletions src/vs/workbench/browser/actions/layoutActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ MenuRegistry.appendMenuItems([{
group: '3_workbench_layout_move',
command: {
id: ToggleSidebarPositionAction.ID,
title: localize('move second sidebar left', "Move Secondary Side Bar Left")
title: localize('move second sidebar left', "Move PearAI Side Bar Left")
},
when: ContextKeyExpr.and(ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))),
order: 1
Expand All @@ -252,7 +252,7 @@ MenuRegistry.appendMenuItems([{
group: '3_workbench_layout_move',
command: {
id: ToggleSidebarPositionAction.ID,
title: localize('move second sidebar right', "Move Secondary Side Bar Right")
title: localize('move second sidebar right', "Move PearAI Side Bar Right")
},
when: ContextKeyExpr.and(ContextKeyExpr.equals('config.workbench.sideBar.location', 'right'), ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))),
order: 1
Expand Down Expand Up @@ -953,7 +953,7 @@ registerAction2(class extends Action2 {
if (!hasAddedView) {
results.push({
type: 'separator',
label: localize('secondarySideBarContainer', "Secondary Side Bar / {0}", containerModel.title)
label: localize('secondarySideBarContainer', "PearAI Side Bar / {0}", containerModel.title)
});
hasAddedView = true;
}
Expand Down Expand Up @@ -1060,7 +1060,7 @@ class MoveFocusedViewAction extends Action2 {
if (!(isViewSolo && currentLocation === ViewContainerLocation.AuxiliaryBar)) {
items.push({
id: '_.auxiliarybar.newcontainer',
label: localize('moveFocusedView.newContainerInSidePanel', "New Secondary Side Bar Entry")
label: localize('moveFocusedView.newContainerInSidePanel', "New PearAI Side Bar Entry")
});
}

Expand Down Expand Up @@ -1108,7 +1108,7 @@ class MoveFocusedViewAction extends Action2 {

items.push({
type: 'separator',
label: localize('secondarySideBar', "Secondary Side Bar")
label: localize('secondarySideBar', "PearAI Side Bar")
});

const pinnedAuxPanels = paneCompositePartService.getPinnedPaneCompositeIds(ViewContainerLocation.AuxiliaryBar);
Expand Down Expand Up @@ -1390,7 +1390,7 @@ if (!isMacintosh || !isNative) {
ToggleVisibilityActions.push(...[
CreateToggleLayoutItem(ToggleActivityBarVisibilityActionId, ContextKeyExpr.notEquals('config.workbench.activityBar.location', 'hidden'), localize('activityBar', "Activity Bar"), { whenA: ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'), iconA: activityBarLeftIcon, iconB: activityBarRightIcon }),
CreateToggleLayoutItem(ToggleSidebarVisibilityAction.ID, SideBarVisibleContext, localize('sideBar', "Primary Side Bar"), { whenA: ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'), iconA: panelLeftIcon, iconB: panelRightIcon }),
CreateToggleLayoutItem(ToggleAuxiliaryBarAction.ID, AuxiliaryBarVisibleContext, localize('secondarySideBar', "Secondary Side Bar"), { whenA: ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'), iconA: panelRightIcon, iconB: panelLeftIcon }),
CreateToggleLayoutItem(ToggleAuxiliaryBarAction.ID, AuxiliaryBarVisibleContext, localize('secondarySideBar', "PearAI Side Bar"), { whenA: ContextKeyExpr.equals('config.workbench.sideBar.location', 'left'), iconA: panelRightIcon, iconB: panelLeftIcon }),
CreateToggleLayoutItem(TogglePanelAction.ID, PanelVisibleContext, localize('panel', "Panel"), panelIcon),
CreateToggleLayoutItem(ToggleStatusbarVisibilityAction.ID, ContextKeyExpr.equals('config.workbench.statusBar.visible', true), localize('statusBar', "Status Bar"), statusBarIcon),
CreateToggleLayoutItem(TogglePearOverlayAction.ID, PearAIVisibleContext, 'PearAI', pearaiIcon)
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/browser/layout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2453,7 +2453,7 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi
comment: 'Information about the layout of the workbench during statup';
activityBarVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the activity bar is visible' };
sideBarVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the primary side bar is visible' };
auxiliaryBarVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the secondary side bar is visible' };
auxiliaryBarVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the PearAI Side Bar is visible' };
panelVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the panel is visible' };
statusbarVisible: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether or the not the status bar is visible' };
sideBarPosition: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'Whether the primary side bar is on the left or right' };
Expand Down
16 changes: 8 additions & 8 deletions src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ const auxiliaryBarLeftOffIcon = registerIcon('auxiliarybar-left-off-layout-icon'
export class ToggleAuxiliaryBarAction extends Action2 {

static readonly ID = 'workbench.action.toggleAuxiliaryBar';
static readonly LABEL = localize2('toggleAuxiliaryBar', "Toggle Secondary Side Bar Visibility");
static readonly LABEL = localize2('toggleAuxiliaryBar', "Toggle PearAI Side Bar Visibility");

constructor() {
super({
id: ToggleAuxiliaryBarAction.ID,
title: ToggleAuxiliaryBarAction.LABEL,
toggled: {
condition: AuxiliaryBarVisibleContext,
title: localize('secondary sidebar', "Secondary Side Bar"),
title: localize('secondary sidebar', "PearAI Side Bar"),
mnemonicTitle: localize({ key: 'secondary sidebar mnemonic', comment: ['&& denotes a mnemonic'] }, "Secondary Si&&de Bar"),
},

Expand Down Expand Up @@ -84,7 +84,7 @@ registerAction2(ToggleAuxiliaryBarAction);
registerAction2(class FocusAuxiliaryBarAction extends Action2 {

static readonly ID = 'workbench.action.focusAuxiliaryBar';
static readonly LABEL = localize2('focusAuxiliaryBar', "Focus into Secondary Side Bar");
static readonly LABEL = localize2('focusAuxiliaryBar', "Focus into PearAI Side Bar");

constructor() {
super({
Expand Down Expand Up @@ -117,7 +117,7 @@ MenuRegistry.appendMenuItems([
group: '2_pane_toggles',
command: {
id: ToggleAuxiliaryBarAction.ID,
title: localize('toggleSecondarySideBar', "Toggle Secondary Side Bar"),
title: localize('toggleSecondarySideBar', "Toggle PearAI Side Bar"),
toggled: { condition: AuxiliaryBarVisibleContext, icon: auxiliaryBarLeftIcon },
icon: auxiliaryBarLeftOffIcon,
},
Expand All @@ -130,7 +130,7 @@ MenuRegistry.appendMenuItems([
group: '2_pane_toggles',
command: {
id: ToggleAuxiliaryBarAction.ID,
title: localize('toggleSecondarySideBar', "Toggle Secondary Side Bar"),
title: localize('toggleSecondarySideBar', "Toggle PearAI Side Bar"),
toggled: { condition: AuxiliaryBarVisibleContext, icon: auxiliaryBarRightIcon },
icon: auxiliaryBarRightOffIcon,
},
Expand All @@ -143,7 +143,7 @@ MenuRegistry.appendMenuItems([
group: '3_workbench_layout_move',
command: {
id: ToggleAuxiliaryBarAction.ID,
title: localize2('hideAuxiliaryBar', 'Hide Secondary Side Bar'),
title: localize2('hideAuxiliaryBar', 'Hide PearAI Side Bar'),
},
when: ContextKeyExpr.and(AuxiliaryBarVisibleContext, ContextKeyExpr.equals('viewLocation', ViewContainerLocationToString(ViewContainerLocation.AuxiliaryBar))),
order: 2
Expand All @@ -155,7 +155,7 @@ registerAction2(class extends SwitchCompositeViewAction {
constructor() {
super({
id: 'workbench.action.previousAuxiliaryBarView',
title: localize2('previousAuxiliaryBarView', 'Previous Secondary Side Bar View'),
title: localize2('previousAuxiliaryBarView', 'Previous PearAI Side Bar View'),
category: Categories.View,
f1: true
}, ViewContainerLocation.AuxiliaryBar, -1);
Expand All @@ -166,7 +166,7 @@ registerAction2(class extends SwitchCompositeViewAction {
constructor() {
super({
id: 'workbench.action.nextAuxiliaryBarView',
title: localize2('nextAuxiliaryBarView', 'Next Secondary Side Bar View'),
title: localize2('nextAuxiliaryBarView', 'Next PearAI Side Bar View'),
category: Categories.View,
f1: true
}, ViewContainerLocation.AuxiliaryBar, 1);
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
actions.push(...[
new Separator(),
new SubmenuAction('workbench.action.panel.position', localize('activity bar position', "Activity Bar Position"), positionActions),
toAction({ id: ToggleSidebarPositionAction.ID, label: currentPositionRight ? localize('move second side bar left', "Move Secondary Side Bar Left") : localize('move second side bar right', "Move Secondary Side Bar Right"), run: () => this.commandService.executeCommand(ToggleSidebarPositionAction.ID) }),
toAction({ id: ToggleAuxiliaryBarAction.ID, label: localize('hide second side bar', "Hide Secondary Side Bar"), run: () => this.commandService.executeCommand(ToggleAuxiliaryBarAction.ID) })
toAction({ id: ToggleSidebarPositionAction.ID, label: currentPositionRight ? localize('move second side bar left', "Move PearAI Side Bar Left") : localize('move second side bar right', "Move PearAI Side Bar Right"), run: () => this.commandService.executeCommand(ToggleSidebarPositionAction.ID) }),
toAction({ id: ToggleAuxiliaryBarAction.ID, label: localize('hide second side bar', "Hide PearAI Side Bar"), run: () => this.commandService.executeCommand(ToggleAuxiliaryBarAction.ID) })
]);
}

Expand Down
3 changes: 1 addition & 2 deletions src/vs/workbench/browser/parts/auxiliarybar/auxiliaryTitleBar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ export class AuxiliaryTitleBar extends Disposable {
private container: HTMLElement;
private readonly iconLabels = [
{ icon: Codicon.layoutPanel, title: 'Toggle Panel', command: 'workbench.action.togglePanel' },
{ icon: Codicon.layoutSidebarRight, title: 'Toggle Secondary Sidebar', command: 'workbench.action.toggleAuxiliaryBar' },
{ icon: Codicon.layoutSidebarRight, title: 'Toggle PearAI Sidebar', command: 'workbench.action.toggleAuxiliaryBar' },
{ icon: Codicon.layoutCentered, title: 'Toggle Centered Layout', command: 'workbench.action.toggleCenteredLayout' },
// { icon: Codicon.layoutActivitybarRight, title: 'Toggle Actions', command: 'workbench.action.toggleActivityBarVisibility' }
];

constructor(
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/browser/parts/paneCompositeBar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export class PaneCompositeBar extends Disposable {
private createMoveAction(viewContainer: ViewContainer, newLocation: ViewContainerLocation, defaultLocation: ViewContainerLocation): IAction {
return toAction({
id: `moveViewContainerTo${newLocation}`,
label: newLocation === ViewContainerLocation.Panel ? localize('panel', "Panel") : newLocation === ViewContainerLocation.Sidebar ? localize('sidebar', "Primary Side Bar") : localize('auxiliarybar', "Secondary Side Bar"),
label: newLocation === ViewContainerLocation.Panel ? localize('panel', "Panel") : newLocation === ViewContainerLocation.Sidebar ? localize('sidebar', "Primary Side Bar") : localize('auxiliarybar', "PearAI Side Bar"),
run: () => {
let index: number | undefined;
if (newLocation !== defaultLocation) {
Expand Down
16 changes: 8 additions & 8 deletions src/vs/workbench/browser/parts/panel/panelActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ registerAction2(class extends Action2 {
constructor() {
super({
id: 'workbench.action.closeAuxiliaryBar',
title: localize2('closeSecondarySideBar', 'Hide Secondary Side Bar'),
title: localize2('closeSecondarySideBar', 'Hide PearAI Side Bar'),
category: Categories.View,
icon: closeIcon,
menu: [{
Expand Down Expand Up @@ -388,7 +388,7 @@ class MoveViewsBetweenPanelsAction extends Action2 {
}


// Move Pear AI extension to secondary side bar (Auxiliary Bar) (we want secondary side bar to be default loaction for extension)
// Move Pear AI extension to PearAI Side Bar (Auxiliary Bar) (we want PearAI Side Bar to be default loaction for extension)
class MovePearExtensionToAuxBarAction extends MoveViewsBetweenPanelsAction {
static readonly ID = 'workbench.action.movePearExtensionToAuxBar';
readonly PearExtensionId;
Expand Down Expand Up @@ -421,14 +421,14 @@ class MovePearExtensionToAuxBarAction extends MoveViewsBetweenPanelsAction {

registerAction2(MovePearExtensionToAuxBarAction);

// --- Move Panel Views To Secondary Side Bar
// --- Move Panel Views To PearAI Side Bar

class MovePanelToSidePanelAction extends MoveViewsBetweenPanelsAction {
static readonly ID = 'workbench.action.movePanelToSidePanel';
constructor() {
super(ViewContainerLocation.Panel, ViewContainerLocation.AuxiliaryBar, {
id: MovePanelToSidePanelAction.ID,
title: localize2('movePanelToSecondarySideBar', "Move Panel Views To Secondary Side Bar"),
title: localize2('movePanelToSecondarySideBar', "Move Panel Views To PearAI Side Bar"),
category: Categories.View,
f1: false
});
Expand All @@ -440,7 +440,7 @@ export class MovePanelToSecondarySideBarAction extends MoveViewsBetweenPanelsAct
constructor() {
super(ViewContainerLocation.Panel, ViewContainerLocation.AuxiliaryBar, {
id: MovePanelToSecondarySideBarAction.ID,
title: localize2('movePanelToSecondarySideBar', "Move Panel Views To Secondary Side Bar"),
title: localize2('movePanelToSecondarySideBar', "Move Panel Views To PearAI Side Bar"),
category: Categories.View,
f1: true
});
Expand All @@ -450,15 +450,15 @@ export class MovePanelToSecondarySideBarAction extends MoveViewsBetweenPanelsAct
registerAction2(MovePanelToSidePanelAction);
registerAction2(MovePanelToSecondarySideBarAction);

// --- Move Secondary Side Bar Views To Panel
// --- Move PearAI Side Bar Views To Panel

class MoveSidePanelToPanelAction extends MoveViewsBetweenPanelsAction {
static readonly ID = 'workbench.action.moveSidePanelToPanel';

constructor() {
super(ViewContainerLocation.AuxiliaryBar, ViewContainerLocation.Panel, {
id: MoveSidePanelToPanelAction.ID,
title: localize2('moveSidePanelToPanel', "Move Secondary Side Bar Views To Panel"),
title: localize2('moveSidePanelToPanel', "Move PearAI Side Bar Views To Panel"),
category: Categories.View,
f1: false
});
Expand All @@ -471,7 +471,7 @@ export class MoveSecondarySideBarToPanelAction extends MoveViewsBetweenPanelsAct
constructor() {
super(ViewContainerLocation.AuxiliaryBar, ViewContainerLocation.Panel, {
id: MoveSecondarySideBarToPanelAction.ID,
title: localize2('moveSidePanelToPanel', "Move Secondary Side Bar Views To Panel"),
title: localize2('moveSidePanelToPanel', "Move PearAI Side Bar Views To Panel"),
category: Categories.View,
f1: true
});
Expand Down
12 changes: 6 additions & 6 deletions src/vs/workbench/browser/workbench.contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
'type': 'string',
'enum': ['left', 'right'],
'default': 'left',
'description': localize('sideBarLocation', "Controls the location of the primary side bar and activity bar. They can either show on the left or right of the workbench. The secondary side bar will show on the opposite side of the workbench.")
'description': localize('sideBarLocation', "Controls the location of the primary side bar and activity bar. They can either show on the left or right of the workbench. The PearAI Side Bar will show on the opposite side of the workbench.")
},
'workbench.panel.showLabels': {
'type': 'boolean',
Expand Down Expand Up @@ -542,12 +542,12 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
'type': 'string',
'enum': ['default', 'top', 'bottom', 'hidden'],
'default': 'default',
'markdownDescription': localize({ comment: ['This is the description for a setting'], key: 'activityBarLocation' }, "Controls the location of the Activity Bar relative to the Primary and Secondary Side Bars."),
'markdownDescription': localize({ comment: ['This is the description for a setting'], key: 'activityBarLocation' }, "Controls the location of the Activity Bar relative to the Primary and PearAI Side Bars."),
'enumDescriptions': [
localize('workbench.activityBar.location.default', "Show the Activity Bar on the side of the Primary Side Bar and on top of the Secondary Side Bar."),
localize('workbench.activityBar.location.top', "Show the Activity Bar on top of the Primary and Secondary Side Bars."),
localize('workbench.activityBar.location.bottom', "Show the Activity Bar at the bottom of the Primary and Secondary Side Bars."),
localize('workbench.activityBar.location.hide', "Hide the Activity Bar in the Primary and Secondary Side Bars.")
localize('workbench.activityBar.location.default', "Show the Activity Bar on the side of the Primary Side Bar and on top of the PearAI Side Bar."),
localize('workbench.activityBar.location.top', "Show the Activity Bar on top of the Primary and PearAI Side Bars."),
localize('workbench.activityBar.location.bottom', "Show the Activity Bar at the bottom of the Primary and PearAI Side Bars."),
localize('workbench.activityBar.location.hide', "Hide the Activity Bar in the Primary and PearAI Side Bars.")
],
},
'workbench.activityBar.iconClickBehavior': {
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export class ViewQuickAccessProvider extends PickerQuickAccessProvider<IViewQuic
// Viewlets / Panels
addPaneComposites(ViewContainerLocation.Sidebar, localize('views', "Side Bar"));
addPaneComposites(ViewContainerLocation.Panel, localize('panels', "Panel"));
addPaneComposites(ViewContainerLocation.AuxiliaryBar, localize('secondary side bar', "Secondary Side Bar"));
addPaneComposites(ViewContainerLocation.AuxiliaryBar, localize('PearAI Side Bar', "PearAI Side Bar"));

const addPaneCompositeViews = (location: ViewContainerLocation) => {
const paneComposites = this.paneCompositeService.getPaneComposites(location);
Expand Down
Loading