diff options
| -rw-r--r-- | lua/plugins/complete-filename.lua | 5 | ||||
| -rw-r--r-- | vis-lua.c | 9 | ||||
| -rwxr-xr-x | vis-open | 5 |
3 files changed, 17 insertions, 2 deletions
diff --git a/lua/plugins/complete-filename.lua b/lua/plugins/complete-filename.lua index cb5b361..98e8ec3 100644 --- a/lua/plugins/complete-filename.lua +++ b/lua/plugins/complete-filename.lua @@ -6,7 +6,7 @@ vis:map(vis.modes.INSERT, "<C-x><C-f>", function() local pos = win.selection.pos if not pos then return end -- TODO do something clever here - local range = file:text_object_word(pos > 0 and pos-1 or pos); + local range = file:text_object_longword(pos > 0 and pos-1 or pos); if not range then return end if range.finish > pos then range.finish = pos end if range.start == range.finish then return end @@ -29,7 +29,8 @@ vis:map(vis.modes.INSERT, "<C-x><C-o>", function() local file = win.file local pos = win.selection.pos if not pos then return end - local range = file:text_object_word(pos > 0 and pos-1 or pos); + -- TODO do something clever here + local range = file:text_object_longword(pos > 0 and pos-1 or pos); if not range then return end if range.finish > pos then range.finish = pos end local prefix = file:content(range) @@ -2234,6 +2234,14 @@ static int file_mark_get(lua_State *L) { * @treturn Range range the range */ +/*** + * WORD text object. + * + * @function text_object_longword + * @tparam int pos the position which must be part of the word + * @treturn Range range the range + */ + static int file_text_object(lua_State *L) { Filerange range = text_range_empty(); File *file = obj_ref_check(L, 1, VIS_LUA_TYPE_FILE); @@ -2703,6 +2711,7 @@ void vis_lua_init(Vis *vis) { const char *name; } textobjects[] = { { VIS_TEXTOBJECT_INNER_WORD, "text_object_word" }, + { VIS_TEXTOBJECT_INNER_LONGWORD, "text_object_longword" }, }; for (size_t i = 0; i < LENGTH(textobjects); i++) { @@ -40,6 +40,11 @@ if [ $# -eq 1 -a "$ALLOW_AUTO_SELECT" = 1 ]; then # If there were globs on the command-line, they've expanded to # a single item, so we can just process it. + # If the file or directory does not exist, abort. + if [ ! -e "$1" ]; then + exit 1 + fi + if [ -d "$1" ]; then # Recurse and show the contents of the named directory, # We pass -f to force the next iteration to present the |