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

Revert "update Modification for WordDB"

Browse Source 
This reverts commit 8f45623f98.

Conflicts:
	src/word_db.cc
This commit is contained in:
Maxime Coste 2014-05-26 21:00:26 +01:00
parent fed2094e89
commit 19a5ed05a6
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/word_db.cc
View File

@ -1,7 +1,7 @@
#include "word_db.hh" #include "word_db.hh"
#include "utils.hh" #include "utils.hh"
#include "modification.hh" #include "line_modification.hh"
#include "utf8_iterator.hh" #include "utf8_iterator.hh"
namespace Kakoune namespace Kakoune
@ -64,7 +64,7 @@ void WordDB::update_db()
{ {
auto& buffer = *m_buffer; auto& buffer = *m_buffer;
auto modifs = compute_modifications(buffer, m_timestamp); auto modifs = compute_line_modifications(buffer, m_timestamp);
m_timestamp = buffer.timestamp(); m_timestamp = buffer.timestamp();
if (modifs.empty()) if (modifs.empty())
@ -77,25 +77,25 @@ void WordDB::update_db()
auto old_line = 0_line; auto old_line = 0_line;
for (auto& modif : modifs) for (auto& modif : modifs)
{ {
kak_assert(0_line <= modif.new_coord.line and kak_assert(0_line <= modif.new_line and modif.new_line < buffer.line_count());
modif.new_coord.line < buffer.line_count()); kak_assert(old_line <= modif.old_line);
while (old_line < modif.old_line)
// copy unchanged lines between last modification and this one
while (old_line < modif.old_coord.line)
new_lines.push_back(std::move(m_line_to_words[(int)old_line++])); new_lines.push_back(std::move(m_line_to_words[(int)old_line++]));
// remove words from removed lines kak_assert((int)new_lines.size() == (int)modif.new_line);
while (old_line <= modif.old_coord.line + modif.num_removed.line
and old_line < m_line_to_words.size())
remove_words(m_words, m_line_to_words[(int)old_line++]);
// add words from new lines while (old_line <= modif.old_line + modif.num_removed)
for (auto l = 0_line; l <= modif.num_added.line; ++l)
{ {
if (modif.new_coord.line + l >= buffer.line_count()) kak_assert(old_line < m_line_to_words.size());
remove_words(m_words, m_line_to_words[(int)old_line++]);
}
for (auto l = 0_line; l <= modif.num_added; ++l)
{
if (modif.new_line + l >= buffer.line_count())
break; break;
new_lines.push_back(get_words(buffer[modif.new_coord.line + l])); new_lines.push_back(get_words(buffer[modif.new_line + l]));
add_words(m_words, new_lines.back()); add_words(m_words, new_lines.back());
} }
} }