New config for object filters

Author: buzzia2001

package.json

@@ -514,6 +514,21 @@
 					"default": true,
 					"description": "If enabled, objects will be sorted by object name. If disabled, objects will be sorted by object type (MI object type)."
 				},
+				"code-for-ibmi.ObjectBrowser.filterDetails": {
+					"type": "string",
+					"default": "both",
+					"enum": [
+						"both",
+						"tooltip",
+						"description"
+					],
+					"enumDescriptions": [
+						"Show the details next to the filter name and in its hover",
+						"Only show the details in the filter's hover",
+						"Only show the details next to the filter name"
+					],
+					"description": "Where the details of an object filter (libraries, objects, members, etc.) are shown in the Object Browser."
+				},
 				"code-for-ibmi.IfsBrowser.DragAndDropDefaultBehavior": {
 					"type": "string",
 					"default": "ask",
@@ -3448,4 +3463,4 @@
 		"halcyontechltd.vscode-ibmi-walkthroughs",
 		"vscode.git"
 	]
-}
+}

src/api/configuration/config/types.ts

@@ -3,6 +3,7 @@ import { Action, ConnectionData, DeploymentMethod } from "../../types";
 
 export type DefaultOpenMode = "browse" | "edit";
 export type ReconnectMode = "always" | "never" | "ask";
+export type FilterDetails = "tooltip" | "description" | "both";
 
 export interface ConnectionConfig extends ConnectionProfile {
   host: string;
@@ -69,6 +70,7 @@ export interface GlobalConfiguration {
   safeDeleteMode: boolean;
   'ObjectBrowser.showNamesInLowercase': boolean;
   'ObjectBrowser.sortObjectsByName': boolean;
+  'ObjectBrowser.filterDetails': FilterDetails;
   autoOpenFile: boolean;
   'terminals.5250.openInEditorArea': boolean;
   'terminals.pase.openInEditorArea': boolean;

src/ui/Tools.ts

@@ -221,12 +221,15 @@ export namespace VscodeTools {
   }
 
   export function filterToToolTip(filter: ObjectFilters) {
-    const tooltip = new MarkdownString(generateTooltipHtmlTable(filter.name, {
-      "Object": filter.object,
-      "Library": filter.library,
-      "Member": filter.member,
-      "Type": filter.memberType || `*`,
-      "Text": filter.memberText || `*`
+    const tooltip = new MarkdownString(generateTooltipHtmlTable(escapeHtml(filter.name), {
+      "Filtering type": filter.filterType === `regex` ? vscode.l10n.t(`Regex`) : vscode.l10n.t(`Simple`),
+      "Libraries": escapeHtml(filter.library),
+      "Objects": escapeHtml(filter.object),
+      "Object types": escapeHtml(filter.types.join(`, `)),
+      "Members": escapeHtml(filter.member),
+      "Member type": escapeHtml(filter.memberType || `*`),
+      "Member text": escapeHtml(filter.memberText || `*`),
+      "Protected": filter.protected ? vscode.l10n.t(`Yes`) : undefined
     }));
     tooltip.supportHtml = true;
     return tooltip;

src/ui/views/objectBrowser.ts

@@ -7,6 +7,7 @@ import IBMi, { MemberParts } from "../../api/IBMi";
 import { SortOptions, SortOrder } from "../../api/IBMiContent";
 import { SearchTools } from "../../api/SearchTools";
 import { Tools } from "../../api/Tools";
+import { onCodeForIBMiConfigurationChange } from "../../config/Configuration";
 import { getMemberUri } from "../../filesystems/qsys/QSysFs";
 import { instance } from "../../instantiate";
 import { CommandResult, DefaultOpenMode, FilteredItem, FocusOptions, IBMiMember, IBMiObject, MemberItem, OBJECT_BROWSER_MIMETYPE, ObjectFilters, ObjectItem, WithLibrary } from "../../typings";
@@ -16,6 +17,7 @@ import { BrowserItem, BrowserItemParameters } from "../types";
 
 const objectNamesLower = () => IBMi.connectionManager.get<boolean>(`ObjectBrowser.showNamesInLowercase`);
 const objectSortOrder = () => IBMi.connectionManager.get<SortOrder>(`ObjectBrowser.sortObjectsByName`) ? `name` : `type`;
+const filterDetails = () => IBMi.connectionManager.get(`ObjectBrowser.filterDetails`) || `both`;
 
 const correctCase = (value: string) => {
   ;
@@ -176,9 +178,12 @@ class ObjectBrowserFilterItem extends ObjectBrowserItem implements WithLibrary {
     super(filter, filter.name, { icon: filter.protected ? `lock-small` : '', state: vscode.TreeItemCollapsibleState.Collapsed });
     this.library = parseFilter(filter.library, filter.filterType).noFilter ? filter.library : '';
     this.contextValue = `filter${this.library ? "_library" : ''}${this.isProtected() ? `_readonly` : ``}`;
-    const memberTextSuffix = filter.memberText && !/^\*(?:ALL)?$/.test(filter.memberText.trim()) ? ` [${filter.memberText}]` : ``;
-    this.description = `${filter.library}/${filter.object}/${filter.member}.${filter.memberType || `*`} (${filter.types.join(`, `)})${memberTextSuffix}`;
-    this.tooltip = VscodeTools.filterToToolTip(filter);
+    const details = filterDetails();
+    if (details !== `tooltip`) {
+      const memberTextSuffix = filter.memberText && !/^\*(?:ALL)?$/.test(filter.memberText.trim()) ? ` [${filter.memberText}]` : ``;
+      this.description = `${filter.library}/${filter.object}/${filter.member}.${filter.memberType || `*`} (${filter.types.join(`, `)})${memberTextSuffix}`;
+    }
+    this.tooltip = details !== `description` ? VscodeTools.filterToToolTip(filter) : ``;
 
     if (this.library) {
       this.resourceUri = vscode.Uri.from({
@@ -561,6 +566,8 @@ export function initializeObjectBrowser(context: vscode.ExtensionContext) {
   context.subscriptions.push(
     objectTreeViewer,
 
+    onCodeForIBMiConfigurationChange(`ObjectBrowser.filterDetails`, () => objectBrowser.refresh()),
+
     vscode.commands.registerCommand(`code-for-ibmi.sortMembersByName`, (item: ObjectBrowserSourcePhysicalFileItem | ObjectBrowserMemberItem) => {
       item.sortBy({ order: "name" });
     }),