Included visibility parameter

Author: markelca

README.md

@@ -47,7 +47,7 @@ Using [lazy.nvim](https://github.com/folke/lazy.nvim)
       -- Configurations for the clapi picker
         clapi = {
           show_inherited = true, -- Set to false to only show members defined in the current class
-          default_visibility = "public", -- Filter by default visibility (public, protected, private)
+          visibility = "public", -- Filter by default visibility (public, protected, private)
         },
       },
     }
@@ -97,7 +97,7 @@ require('telescope').setup {
 
       -- Default visibility filter (default: nil - show all)
       -- Can be "public", "protected", "private", or nil
-      default_visibility = nil,
+      visibility = nil,
 
       -- Additional display customization options
       display = {

doc/clapi.txt

@@ -101,13 +101,16 @@ The clapi picker accepts the following options:
   - `entry_maker`: Custom entry maker function
   - `show_inherited`: Whether to show inherited members from parent classes,
     traits, and interfaces (defaults to true)
+  - `visibility`: Filter members by visibility: "public", "protected", "private",
+    or nil to show all (defaults to nil)
 
 Example configuration: >lua
   require('telescope').setup {
     extensions = {
       clapi = {
         -- Default configuration options
         show_inherited = true, -- Set to false to only show members defined in the current class
+        visibility = "public", -- Only show public members (nil shows all)
       },
     },
   }
@@ -134,6 +137,8 @@ Parameters:
     - `show_inherited` (boolean, optional): Show inherited members from parent classes,
       traits, and interfaces. Defaults to true. Set to false to only show members
       defined in the current class.
+    - `visibility` (string, optional): Filter by visibility. Can be "public",
+      "protected", "private", or nil to show all. Defaults to nil.
 
 Returns: nil
 
@@ -157,7 +162,8 @@ Advanced usage with custom options: >lua
   -- Open the API picker with specific options
   require('clapi').builtin({
     path_display = { "smart" },
-    show_inherited = false -- Only show members defined in the current class
+    show_inherited = false, -- Only show members defined in the current class
+    visibility = "public"   -- Only show public members
   })
 <
 

lua/clapi/finder.lua

@@ -14,8 +14,10 @@ local M = {}
 ---@param opts.path_display? table|string How to display paths
 ---@param opts.entry_maker? function Custom entry maker function
 ---@param opts.show_inherited? boolean Show inherited members, defaults to true
+---@param opts.visibility? string Filter by visibility (public, protected, private), defaults to nil (all)
 ---@return nil
 M.builtin = function(opts)
+	-- vim.print(opts)
 	opts = opts or {}
 	opts.bufnr = opts.bufnr or 0
 	opts.path_display = { "hidden" }

lua/clapi/parser/init.lua

@@ -42,6 +42,7 @@ end
 ---@param opts table Options for parsing
 ---@param opts.bufnr? integer Buffer number, defaults to current buffer (0)
 ---@param opts.show_inherited? boolean Whether to include inherited members from grandparents, defaults to true
+---@param opts.visibility? string Filter by visibility (public, protected, private), defaults to nil (all)
 ---@return table|nil definitions List of definitions from parent class or nil if error
 local get_parent_file = async.wrap(function(opts, callback)
 	opts = opts or {}
@@ -114,16 +115,20 @@ local get_parent_file = async.wrap(function(opts, callback)
 					callback(nil)
 					return
 				end
-				vim.print("fp", filepath)
 				-- Pass the show_inherited option to parse_file for recursive parent parsing
 				local defs = M.parse_file({
 					filename = filepath,
 					class_name = class_name,
 					show_inherited = opts.show_inherited,
+					visibility = opts.visibility,
 				})
 				for _, value in pairs(defs or {}) do
+					-- Private members from parent classes are inaccessible
 					if value["visibility"] ~= "private" then
-						table.insert(result, value)
+						-- Apply visibility filter if specified
+						if not opts.visibility or value.visibility == opts.visibility then
+							table.insert(result, value)
+						end
 					end
 				end
 			end
@@ -140,6 +145,7 @@ end, 2)
 ---@param opts.filetype? string Force filetype instead of detecting from extension
 ---@param opts.query_str? string Custom query string instead of loading from queries
 ---@param opts.show_inherited? boolean Whether to include inherited members, defaults to true
+---@param opts.visibility? string Filter by visibility (public, protected, private), defaults to nil (all)
 ---@return table|nil results List of symbols found or nil if error
 M.parse_file = async.wrap(function(opts, callback)
 	opts = opts or {}
@@ -266,13 +272,22 @@ M.parse_file = async.wrap(function(opts, callback)
 
 		if capture_name == "method_name" then
 			local method = parser.parse_method(node, start_col, start_row, opts)
-			table.insert(result, method)
+			-- Apply visibility filter if specified
+			if not opts.visibility or method.visibility == opts.visibility then
+				table.insert(result, method)
+			end
 		elseif capture_name == "prop_name" then
 			local property = parser.parse_property(node, start_col, start_row, opts)
-			table.insert(result, property)
+			-- Apply visibility filter if specified
+			if not opts.visibility or property.visibility == opts.visibility then
+				table.insert(result, property)
+			end
 		elseif capture_name == "const_name" then
 			local const = parser.parse_constant(node, start_col, start_row, opts)
-			table.insert(result, const)
+			-- Apply visibility filter if specified
+			if not opts.visibility or const.visibility == opts.visibility then
+				table.insert(result, const)
+			end
 		end
 	end
 
@@ -282,14 +297,19 @@ M.parse_file = async.wrap(function(opts, callback)
 			local parent_defs = get_parent_file({
 				bufnr = opts.bufnr,
 				show_inherited = opts.show_inherited,
+				-- Pass visibility to parent search as well
+				visibility = opts.visibility,
 			})
 			if not parent_defs then
 				-- error already printed somewhere
 				callback(result)
 				return
 			end
 			for _, value in pairs(parent_defs) do
-				table.insert(result, value)
+				-- Apply visibility filter if specified
+				if not opts.visibility or value.visibility == opts.visibility then
+					table.insert(result, value)
+				end
 			end
 
 			callback(result)

lua/telescope/_extensions/clapi.lua

@@ -4,16 +4,18 @@ local telescope = require("telescope")
 
 local default_config = {
 	show_inherited = true,
+	visibility = nil, -- Default to showing all visibilities (public, protected, private)
 }
 
 return telescope.register_extension({
 	setup = function(ext_config)
 		default_config = vim.tbl_deep_extend("force", default_config, ext_config or {})
 	end,
 	exports = {
-		clapi = function()
+		clapi = function(opts)
 			-- We copy the config to avoid polluting the extension default config between executions
 			local config = vim.deepcopy(default_config)
+			config = vim.tbl_deep_extend("force", config, opts or {})
 			return require("clapi").builtin(config)
 		end,
 	},