xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edit commands accept a -scratch flag to edit not to be saved file

Browse Source
This commit is contained in:
Maxime Coste 2012-08-07 23:20:11 +02:00
parent dd05d6c6f5
commit 207f2f6bb9
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/commands.cc
View File

@ -232,24 +232,32 @@ Buffer* open_or_create(const String& filename)
template<bool force_reload> template<bool force_reload>
void edit(const CommandParameters& params, Context& context) void edit(const CommandParameters& params, Context& context)
{ {
if (params.size() == 0 or params.size() > 3) ParametersParser parser(params, { { "scratch", false } });
const size_t param_count = parser.positional_count();
if (param_count == 0 or param_count > 3)
throw wrong_argument_count(); throw wrong_argument_count();
const String& filename = params[0]; const String& filename = parser[0];
Buffer* buffer = nullptr; Buffer* buffer = nullptr;
if (not force_reload) if (not force_reload)
buffer = BufferManager::instance().get_buffer(filename); buffer = BufferManager::instance().get_buffer(filename);
if (not buffer) if (not buffer)
buffer = open_or_create(filename); {
if (parser.has_option("scratch"))
buffer = new Buffer(filename, Buffer::Type::Scratch);
else
buffer = open_or_create(filename);
}
Window& window = *buffer->get_or_create_window(); Window& window = *buffer->get_or_create_window();
if (params.size() > 1) if (param_count > 1)
{ {
int line = std::max(0, str_to_int(params[1]) - 1); int line = std::max(0, str_to_int(parser[1]) - 1);
int column = params.size() > 2 ? int column = param_count > 2 ?
std::max(0, str_to_int(params[2]) - 1) : 0; std::max(0, str_to_int(parser[2]) - 1) : 0;
window.select(window.buffer().iterator_at({line, column})); window.select(window.buffer().iterator_at({line, column}));
} }