aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/api/vim.c
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2020-11-24 14:18:46 +0100
committerBjörn Linse <bjorn.linse@gmail.com>2020-11-24 14:18:46 +0100
commitd285fa73da7ce2cb9abfbbb423eb8506e7202411 (patch)
tree900f9e0b6ded0bba865106d6c1cf367b06145aed /src/nvim/api/vim.c
parent7dfeadb0fcbcedeafc357e60f0b7b2b8916afeaf (diff)
downloadrneovim-d285fa73da7ce2cb9abfbbb423eb8506e7202411.tar.gz
rneovim-d285fa73da7ce2cb9abfbbb423eb8506e7202411.tar.bz2
rneovim-d285fa73da7ce2cb9abfbbb423eb8506e7202411.zip
api: enable nvim_get_runtime_file to find subdirectories
Diffstat (limited to 'src/nvim/api/vim.c')
-rw-r--r--src/nvim/api/vim.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 710885d295..77002697fe 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -788,10 +788,15 @@ ArrayOf(String) nvim_list_runtime_paths(void)
///
/// 'name' can contain wildcards. For example
/// nvim_get_runtime_file("colors/*.vim", true) will return all color
-/// scheme files.
+/// scheme files. Always use forward slashes (/) in the search pattern for
+/// subdirectories regardless of platform.
///
/// It is not an error to not find any files. An empty array is returned then.
///
+/// To find a directory, `name` must end with a forward slash, like
+/// "rplugin/python/". Without the slash it would instead look for an ordinary
+/// file called "rplugin/python".
+///
/// @param name pattern of files to search for
/// @param all whether to return all matches or only the first
/// @return list of absolute paths to the found files
@@ -801,14 +806,13 @@ ArrayOf(String) nvim_get_runtime_file(String name, Boolean all, Error *err)
{
Array rv = ARRAY_DICT_INIT;
- // TODO(bfredl):
- if (name.size == 0) {
- api_set_error(err, kErrorTypeValidation, "not yet implemented");
- return rv;
+ int flags = DIP_START | (all ? DIP_ALL : 0);
+
+ if (name.size == 0 || name.data[name.size-1] == '/') {
+ flags |= DIP_DIR;
}
- int flags = DIP_START | (all ? DIP_ALL : 0);
- do_in_runtimepath((char_u *)name.data,
+ do_in_runtimepath((char_u *)(name.size ? name.data : ""),
flags, find_runtime_cb, &rv);
return rv;
}