Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -747,12 +747,12 @@
{
"command": "r.workspaceViewer.view",
"group": "inline",
"when": "view == workspaceViewer"
"when": "view == workspaceViewer && viewItem == rootNode"
},
{
"command": "r.workspaceViewer.remove",
"group": "inline",
"when": "view == workspaceViewer"
"when": "view == workspaceViewer && viewItem == rootNode"
},
{
"command": "r.helpPanel.searchPackage",
Expand Down
62 changes: 52 additions & 10 deletions src/workspaceViewer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,25 @@ export class WorkspaceDataProvider implements TreeDataProvider<WorkspaceItem> {
return element;
}

getChildren(): WorkspaceItem[] {
return this.getWorkspaceItems(this.data);
getChildren(element?: WorkspaceItem): WorkspaceItem[] {
if (element) {
return element.str
.split('\n')
.filter((elem, index) => {return index > 0;})
.map(strItem =>
new WorkspaceItem(
'',
'',
strItem.replace(/\s+/g,' ').trim(),
'',
0,
element.treeLevel + 1
)
);
} else {
return this.getWorkspaceItems(this.data);
}

}

private getWorkspaceItems(data: WorkspaceAttr): WorkspaceItem[] {
Expand All @@ -48,7 +65,7 @@ export class WorkspaceDataProvider implements TreeDataProvider<WorkspaceItem> {
str,
type,
size,
TreeItemCollapsibleState.None,
0,
dim,
);
};
Expand Down Expand Up @@ -83,20 +100,28 @@ export class WorkspaceDataProvider implements TreeDataProvider<WorkspaceItem> {
}

export class WorkspaceItem extends TreeItem {
public label: string;
label: string;
desc: string;
str: string;
treeLevel: number;
contextValue: string;

constructor(
label: string,
rClass: string,
str: string,
type: string,
size: number,
collapsibleState: TreeItemCollapsibleState,
dim?: number[]
treeLevel: number,
dim?: number[],
) {
super(label, collapsibleState);
super(label, WorkspaceItem.setCollapsibleState(treeLevel, type, str));
this.description = this.getDescription(dim, str, rClass);
this.tooltip = this.getTooltip(label, rClass, size);
this.tooltip = this.getTooltip(label, rClass, size, treeLevel);
this.contextValue = type;
this.str = str;
this.treeLevel = treeLevel;
this.contextValue = treeLevel === 0 ? 'rootNode' : `childNode${treeLevel}`;
}

private getDescription(dim: number[], str: string, rClass: string): string {
Expand All @@ -110,13 +135,30 @@ export class WorkspaceItem extends TreeItem {
return str;
}
}
private getTooltip(label:string, rClass: string, size: number): string {
if (size !== undefined) {
private getTooltip(label:string, rClass: string,
size: number, treeLevel: number): string {

if (size !== undefined && treeLevel === 0) {
return `${label} (${rClass}, ${size} bytes)`;
} else if (treeLevel === 1) {
return null;
} else {
return `${label} (${rClass})`;
}
}

/* This logic has to be implemented this way to allow it to be called
during the super constructor above. I created it to give full control
of what elements can have have 'child' nodes os not. It can be expanded
in the futere for more tree levels.*/

private static setCollapsibleState(treeLevel: number, type: string, str: string) {
if (treeLevel === 0 && type === 'list' && str.includes('\n')){
return TreeItemCollapsibleState.Collapsed;
} else {
return TreeItemCollapsibleState.None;
}
}
}

export function clearWorkspace(): void {
Expand Down