diff --git a/CHANGELOG.md b/CHANGELOG.md index 010cf12ca..8d9f36218 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,10 @@ * perf: optimize package monitoring in helpServer.R +### Other + +* Remove the unused `r.workspaceViewer.showObjectSize` setting and obsolete object-size tooltip support + ### Styling * style: fix line length lint error in sess/R/rstudioapi.R diff --git a/package.json b/package.json index f28130c91..6eb357211 100644 --- a/package.json +++ b/package.json @@ -1755,11 +1755,6 @@ "default": 8, "markdownDescription": "Delay in milliseconds before sending each line to rterm. Requires `#r.bracketedPaste#` to be `false`." }, - "r.workspaceViewer.showObjectSize": { - "type": "boolean", - "default": false, - "markdownDescription": "Show object size when hovering over a workspace viewer item." - }, "r.workspaceViewer.removeHiddenItems": { "type": "boolean", "default": false, @@ -2052,4 +2047,4 @@ "extensionDependencies": [ "REditorSupport.r-syntax" ] -} \ No newline at end of file +} diff --git a/src/session.ts b/src/session.ts index 6e13e1af2..9fd9125f2 100644 --- a/src/session.ts +++ b/src/session.ts @@ -30,7 +30,6 @@ export interface GlobalEnv { type: string; length: number; str: string; - size?: number; dim?: number[], names?: string[], slots?: string[], diff --git a/src/test/testdata/session/workspace.json b/src/test/testdata/session/workspace.json index 7421ea5c9..daa6a735b 100644 --- a/src/test/testdata/session/workspace.json +++ b/src/test/testdata/session/workspace.json @@ -34,7 +34,6 @@ ], "type": "character", "length": 1, - "size": 112, "str": "chr \"a\"" }, "b": { @@ -43,7 +42,6 @@ ], "type": "integer", "length": 1, - "size": 56, "str": "int 1" }, "c": { @@ -52,7 +50,6 @@ ], "type": "double", "length": 1, - "size": 56, "str": "num 1.5" }, "d": { @@ -61,7 +58,6 @@ ], "type": "complex", "length": 1, - "size": 64, "str": "cplx 0+0i" }, "e": { @@ -70,7 +66,6 @@ ], "type": "logical", "length": 1, - "size": 56, "str": "logi TRUE" }, "f": { @@ -79,7 +74,6 @@ ], "type": "closure", "length": 1, - "size": 1240, "str": "function (x, ...)" }, "g": { @@ -88,7 +82,6 @@ ], "type": "environment", "length": 11, - "size": 56, "str": "", "names": [ "a", @@ -110,7 +103,6 @@ ], "type": "list", "length": 2, - "size": 520, "str": "List of 2\n $ a: num 1\n $ b: chr \"foo\"", "names": [ "a", @@ -123,7 +115,6 @@ ], "type": "list", "length": 11, - "size": 7208, "str": "'data.frame':\t32 obs. of 11 variables:\n $ mpg : num 21 21 ...\n $ cyl : num 6 6 ...\n $ disp: num 160 160 ...\n $ hp : num 110 110 ...\n $ drat: num 3.9 3.9 ...\n $ wt : num 2.62 ...\n $ qsec: num 16.5 ...\n $ vs : num 0 0 ...\n $ am : num 1 1 ...\n $ gear: num 4 4 ...\n $ carb: num 4 4 ...", "names": [ "mpg", diff --git a/src/workspaceViewer.ts b/src/workspaceViewer.ts index 12a9f6288..14162fb47 100644 --- a/src/workspaceViewer.ts +++ b/src/workspaceViewer.ts @@ -145,7 +145,6 @@ export class WorkspaceDataProvider implements TreeDataProvider { child.class, child.str.replace(/\s+/g, ' ').trim(), child.type, - 0, element.treeLevel + 1, undefined, child.has_children, @@ -175,7 +174,6 @@ export class WorkspaceDataProvider implements TreeDataProvider { rClass: string, str: string, type: string, - size?: number, dim?: number[], hasChildren?: boolean ): GlobalEnvItem => { @@ -184,7 +182,6 @@ export class WorkspaceDataProvider implements TreeDataProvider { rClass, str, type, - size, TreeLevel.Parent, dim, hasChildren, @@ -197,7 +194,6 @@ export class WorkspaceDataProvider implements TreeDataProvider { getFirstClass(globalenv[key].class), globalenv[key].str, globalenv[key].type, - globalenv[key].size, globalenv[key].dim, globalenv[key].has_children, )) : []; @@ -350,7 +346,6 @@ export class GlobalEnvItem extends TreeItem { rClass: string, str: string, type: string, - size?: number, treeLevel?: number, dim?: number[], hasChildren?: boolean, @@ -372,7 +367,7 @@ export class GlobalEnvItem extends TreeItem { rClass, type ); - this.tooltip = this.getTooltip(label, rClass, size, treeLevel); + this.tooltip = this.getTooltip(label, rClass, treeLevel); this.iconPath = this.getIcon(type, dim); this.contextValue = treeLevel === 0 ? 'rootNode' : `childNode${this.treeLevel}`; } @@ -389,24 +384,12 @@ export class GlobalEnvItem extends TreeItem { } } - private getSizeString(bytes: number): string { - if (bytes < 1024) { - return `${bytes} bytes`; - } else { - const e = Math.floor(Math.log(bytes) / Math.log(1024)); - return (bytes / Math.pow(1024, e)).toFixed(0) + 'KMGTP'.charAt(e - 1) + 'b'; - } - } - private getTooltip( label: string, rClass: string, - size?: number, treeLevel?: number ): string { - if (size && treeLevel === TreeLevel.Parent) { - return `${label} (${rClass}, ${this.getSizeString(size)})`; - } else if (treeLevel === TreeLevel.Scalar) { + if (treeLevel === TreeLevel.Scalar) { return ''; } else { return `${label} (${rClass})`;