From 71a1893a5eeae6d230b07b8f9ee47288655be4f9 Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Thu, 5 Apr 2018 08:52:33 +1000 Subject: [PATCH] Fix some trailing spaces and a tab that sneaked into the code base --- src/display_buffer.cc | 2 +- src/hash_map.hh | 2 +- src/json_ui.cc | 2 +- src/regex_impl.cc | 4 ++-- src/remote.cc | 4 ++-- src/selectors.cc | 4 ++-- src/string.hh | 2 +- src/word_db.cc | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/display_buffer.cc b/src/display_buffer.cc index 3a1449d7..a634ff5b 100644 --- a/src/display_buffer.cc +++ b/src/display_buffer.cc @@ -105,7 +105,7 @@ DisplayLine::iterator DisplayLine::split(iterator it, ColumnCount count) return m_atoms.insert(it, std::move(atom)); } auto pos = utf8::advance(get_iterator(it->buffer(), it->begin()), - get_iterator(it->buffer(), it->end()), + get_iterator(it->buffer(), it->end()), count).coord(); return split(it, pos); } diff --git a/src/hash_map.hh b/src/hash_map.hh index e0f7a4e2..5a144ca1 100644 --- a/src/hash_map.hh +++ b/src/hash_map.hh @@ -291,7 +291,7 @@ struct HashMap constexpr bool empty() const { return m_items.empty(); } constexpr void reserve(size_t size) { - m_items.reserve(size); + m_items.reserve(size); m_index.reserve(size); } diff --git a/src/json_ui.cc b/src/json_ui.cc index 01d95f9c..c930d6ef 100644 --- a/src/json_ui.cc +++ b/src/json_ui.cc @@ -75,7 +75,7 @@ String to_json(Color color) String to_json(Attribute attributes) { struct Attr { Attribute attr; StringView name; } - attrs[] { + attrs[] { { Attribute::Exclusive, "exclusive" }, { Attribute::Underline, "underline" }, { Attribute::Reverse, "reverse" }, diff --git a/src/regex_impl.cc b/src/regex_impl.cc index 1c2dfd84..bf32cde2 100644 --- a/src/regex_impl.cc +++ b/src/regex_impl.cc @@ -9,7 +9,7 @@ #include "string_utils.hh" #include "vector.hh" -#include +#include namespace Kakoune { @@ -390,7 +390,7 @@ private: std::sort(ranges.begin(), ranges.end(), [](auto& lhs, auto& rhs) { return lhs.min < rhs.min; }); - // merge overlapping ranges + // merge overlapping ranges auto pos = ranges.begin(); for (auto next = pos+1; next != ranges.end(); ++next) { diff --git a/src/remote.cc b/src/remote.cc index f3dd7d06..b851474f 100644 --- a/src/remote.cc +++ b/src/remote.cc @@ -173,7 +173,7 @@ public: uint32_t size() const { - kak_assert(m_write_pos >= header_size); + kak_assert(m_write_pos >= header_size); uint32_t res; memcpy(&res, m_stream.data() + sizeof(MessageType), sizeof(uint32_t)); return res; @@ -181,7 +181,7 @@ public: MessageType type() const { - kak_assert(m_write_pos >= header_size); + kak_assert(m_write_pos >= header_size); return *reinterpret_cast(m_stream.data()); } diff --git a/src/selectors.cc b/src/selectors.cc index d8ca897b..124958e2 100644 --- a/src/selectors.cc +++ b/src/selectors.cc @@ -353,7 +353,7 @@ find_surrounding(const Container& container, Iterator pos, first = utf8::previous(first, container.begin()); if (auto res = find_opening(first+1, container, opening, closing, level, nestable)) - first = (flags & ObjectFlags::Inner) ? res->second : res->first; + first = (flags & ObjectFlags::Inner) ? res->second : res->first; else return {}; } @@ -370,7 +370,7 @@ find_surrounding(const Container& container, Iterator pos, if (auto res = find_closing(last, container, opening, closing, level, nestable)) last = (flags & ObjectFlags::Inner) ? utf8::previous(res->first, container.begin()) - : utf8::previous(res->second, container.begin()); + : utf8::previous(res->second, container.begin()); else return {}; } diff --git a/src/string.hh b/src/string.hh index ddb5be8d..ae41642c 100644 --- a/src/string.hh +++ b/src/string.hh @@ -191,7 +191,7 @@ public: const char* data() const { return is_long() ? l.ptr : s.string; } char* data() { return is_long() ? l.ptr : s.string; } - template + template void reserve(size_t new_capacity); void set_size(size_t size); void force_size(size_t new_size); diff --git a/src/word_db.cc b/src/word_db.cc index 8bcfa250..a5d59e4c 100644 --- a/src/word_db.cc +++ b/src/word_db.cc @@ -21,7 +21,7 @@ static WordList get_words(StringView content, ConstArrayView extra_wo { if (is_word(*it)) { - const char* word = it.base(); + const char* word = it.base(); while (++it != content.end() and is_word(*it)) {} res.emplace_back(word, it.base());