Permalink
Browse files

Merge pull request #9272 from bfredl/createbuf

api: add nvim_create_buf to create a new empty buffer.
  • Loading branch information...
bfredl committed Feb 9, 2019
2 parents c9d01ff + 891ed14 commit 3ff1228f785705a46a0bd24fb5dc2bf76b6dad68
Showing with 62 additions and 5 deletions.
  1. +4 −3 src/nvim/api/private/helpers.c
  2. +19 −0 src/nvim/api/vim.c
  3. +1 −1 src/nvim/buffer.c
  4. +1 −1 src/nvim/buffer.h
  5. +37 −0 test/functional/api/vim_spec.lua
@@ -27,6 +27,7 @@
#include "nvim/version.h"
#include "nvim/lib/kvec.h"
#include "nvim/getchar.h"
#include "nvim/fileio.h"
#include "nvim/ui.h"

/// Helper structure for vim_to_object
@@ -1094,7 +1095,7 @@ static void set_option_value_for(char *key,
{
win_T *save_curwin = NULL;
tabpage_T *save_curtab = NULL;
bufref_T save_curbuf = { NULL, 0, 0 };
aco_save_T aco;

try_start();
switch (opt_type)
@@ -1115,9 +1116,9 @@ static void set_option_value_for(char *key,
restore_win(save_curwin, save_curtab, true);
break;
case SREQ_BUF:
switch_buffer(&save_curbuf, (buf_T *)from);
aucmd_prepbuf(&aco, (buf_T *)from);
set_option_value_err(key, numval, stringval, opt_flags, err);
restore_buffer(&save_curbuf);
aucmd_restbuf(&aco);
break;
case SREQ_GLOBAL:
set_option_value_err(key, numval, stringval, opt_flags, err);
@@ -955,6 +955,25 @@ void nvim_set_current_win(Window window, Error *err)
}
}

/// Create new empty buffer
///
/// @param listed whether the buffer should be listed
/// @param[out] err Error details, if any
/// @return the buffer handle or 0 when error
Buffer nvim_create_buf(Boolean listed, Error *err)
FUNC_API_SINCE(6)
{
try_start();
Buffer buffer = buflist_add(NULL,
BLN_NOOPT | BLN_NEW | (listed ? BLN_LISTED : 0));
if (!try_end(err) && buffer == 0) {
api_set_error(err,
kErrorTypeException,
"Failed to create buffer");
}
return buffer;
}

/// Gets the current list of tabpage handles.
///
/// @return List of tabpage handles
@@ -1629,7 +1629,7 @@ buf_T * buflist_new(char_u *ffname, char_u *sfname, linenr_T lnum, int flags)
FileID file_id;
bool file_id_valid = (sfname != NULL
&& os_fileid((char *)sfname, &file_id));
if (ffname != NULL && !(flags & BLN_DUMMY)
if (ffname != NULL && !(flags & (BLN_DUMMY | BLN_NEW))
&& (buf = buflist_findname_file_id(ffname, &file_id,
file_id_valid)) != NULL) {
xfree(ffname);
@@ -31,7 +31,7 @@ enum bln_values {
BLN_CURBUF = 1, // May re-use curbuf for new buffer
BLN_LISTED = 2, // Put new buffer in buffer list
BLN_DUMMY = 4, // Allocating dummy buffer
// TODO(mhinz): merge patch that introduces BLN_NEW
BLN_NEW = 8, // create a new buffer
BLN_NOOPT = 16, // Don't copy options to existing buffer
};

@@ -1308,4 +1308,41 @@ describe('API', function()
eq({["ns-1"]=1, ["ns-2"]=2}, meths.get_namespaces())
end)
end)

describe('nvim_create_buf', function()
it('works', function()
eq({id=2}, meths.create_buf(true))
eq({id=3}, meths.create_buf(false))
eq(' 1 %a "[No Name]" line 1\n'..
' 2 "[No Name]" line 0',
meths.command_output("ls"))
-- current buffer didn't change
eq({id=1}, meths.get_current_buf())

local screen = Screen.new(20, 4)
screen:attach()
meths.buf_set_lines(2, 0, -1, true, {"some text"})
meths.set_current_buf(2)
screen:expect([[
^some text |
{1:~ }|
{1:~ }|
|
]], {
[1] = {bold = true, foreground = Screen.colors.Blue1},
})
end)

it('can change buftype before visiting', function()
meths.set_option("hidden", false)
eq({id=2}, meths.create_buf(true))
meths.buf_set_option(2, "buftype", "nofile")
meths.buf_set_lines(2, 0, -1, true, {"test text"})
command("split | buffer 2")
eq({id=2}, meths.get_current_buf())
-- if the buf_set_option("buftype") didn't work, this would error out.
command("close")
eq({id=1}, meths.get_current_buf())
end)
end)
end)

0 comments on commit 3ff1228

Please sign in to comment.