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

Remove Range::content

Browse Source
This commit is contained in:
Maxime Coste 2013-05-27 14:22:21 +02:00
parent 93dd1ff3c7
commit 7f8d5c1fd0
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/editor.cc
View File

@ -129,7 +129,7 @@ std::vector<String> Editor::selections_content() const
{
std::vector<String> contents;
for (auto& sel : m_selections)
contents.push_back(sel.content());
contents.push_back(m_buffer->string(sel.min(), utf8::next(sel.max())));
return contents;
}

3
src/main.cc
View File

@ -67,7 +67,8 @@ void register_env_vars()
{ return to_string(context.buffer().timestamp()); });
shell_manager.register_env_var("selection",
[](const String& name, const Context& context)
{ return context.editor().main_selection().content(); });
{ const Range& sel = context.editor().main_selection();
return context.buffer().string(sel.min(), utf8::next(sel.max())); });
shell_manager.register_env_var("selections",
[](const String& name, const Context& context)
{ auto sels = context.editor().selections_content();

3
src/normal.cc
View File

@ -135,7 +135,8 @@ void goto_commands(Context& context)
}
case 'f':
{
String filename = context.editor().main_selection().content();
const Range& sel = context.editor().main_selection();
String filename = context.buffer().string(sel.min(), utf8::next(sel.max()));
static constexpr char forbidden[] = { '\'', '\\', '\0' };
for (auto c : forbidden)
if (contains(filename, c))

5
src/selection.cc
View File

@ -14,11 +14,6 @@ void Range::merge_with(const Range& range)
m_first = std::max(m_first, range.m_first);
}
String Range::content() const
{
return m_first.buffer().string(min(), utf8::next(max()));
}
void Range::check_invariant() const
{
#ifdef KAK_DEBUG

1
src/selection.hh
View File

@ -29,7 +29,6 @@ public:
const BufferIterator& min() const { return std::min(m_first, m_last); }
const BufferIterator& max() const { return std::max(m_first, m_last); }
String content() const;
void check_invariant() const;
private: