Add status info when navigating through jumplist (<c-o>, <c-i>)

This commit is contained in:
Delapouite 2017-09-27 17:26:39 +02:00
parent 76f072a786
commit 6b339b7a97
3 changed files with 17 additions and 6 deletions

View File

@ -2,6 +2,7 @@
#include "alias_registry.hh" #include "alias_registry.hh"
#include "client.hh" #include "client.hh"
#include "face_registry.hh"
#include "register_manager.hh" #include "register_manager.hh"
#include "window.hh" #include "window.hh"
@ -85,26 +86,33 @@ void JumpList::push(SelectionList jump)
m_current = m_jumps.size(); m_current = m_jumps.size();
} }
const SelectionList& JumpList::forward() const SelectionList& JumpList::forward(Context& context)
{ {
if (m_current != m_jumps.size() and if (m_current != m_jumps.size() and
m_current + 1 != m_jumps.size()) m_current + 1 != m_jumps.size())
{ {
SelectionList& res = m_jumps[++m_current]; SelectionList& res = m_jumps[++m_current];
res.update(); res.update();
context.print_status({ format("jumped to #{} ({})",
m_current, m_jumps.size() - 1),
get_face("Information") });
return res; return res;
} }
throw runtime_error("no next jump"); throw runtime_error("no next jump");
} }
const SelectionList& JumpList::backward(const SelectionList& current) const SelectionList& JumpList::backward(Context& context)
{ {
const SelectionList& current = context.selections();
if (m_current != m_jumps.size() and if (m_current != m_jumps.size() and
m_jumps[m_current] != current) m_jumps[m_current] != current)
{ {
push(current); push(current);
SelectionList& res = m_jumps[--m_current]; SelectionList& res = m_jumps[--m_current];
res.update(); res.update();
context.print_status({ format("jumped to #{} ({})",
m_current, m_jumps.size() - 1),
get_face("Information") });
return res; return res;
} }
if (m_current != 0) if (m_current != 0)
@ -117,6 +125,9 @@ const SelectionList& JumpList::backward(const SelectionList& current)
} }
SelectionList& res = m_jumps[--m_current]; SelectionList& res = m_jumps[--m_current];
res.update(); res.update();
context.print_status({ format("jumped to #{} ({})",
m_current, m_jumps.size() - 1),
get_face("Information") });
return res; return res;
} }
throw runtime_error("no previous jump"); throw runtime_error("no previous jump");

View File

@ -20,8 +20,8 @@ class AliasRegistry;
struct JumpList struct JumpList
{ {
void push(SelectionList jump); void push(SelectionList jump);
const SelectionList& forward(); const SelectionList& forward(Context& context);
const SelectionList& backward(const SelectionList& current); const SelectionList& backward(Context& context);
void forget_buffer(Buffer& buffer); void forget_buffer(Buffer& buffer);
friend bool operator==(const JumpList& lhs, const JumpList& rhs) friend bool operator==(const JumpList& lhs, const JumpList& rhs)

View File

@ -1399,8 +1399,8 @@ template<Direction direction>
void jump(Context& context, NormalParams) void jump(Context& context, NormalParams)
{ {
auto jump = (direction == Forward) ? auto jump = (direction == Forward) ?
context.jump_list().forward() : context.jump_list().forward(context) :
context.jump_list().backward(context.selections()); context.jump_list().backward(context);
Buffer* oldbuf = &context.buffer(); Buffer* oldbuf = &context.buffer();
Buffer& buffer = const_cast<Buffer&>(jump.buffer()); Buffer& buffer = const_cast<Buffer&>(jump.buffer());