sort includes directives

src/buffer.cc

@@ -1,11 +1,11 @@
 #include "buffer.hh"
 
-#include "buffer_manager.hh"
-#include "window.hh"
 #include "assert.hh"
-#include "utils.hh"
+#include "buffer_manager.hh"
 #include "context.hh"
 #include "file.hh"
+#include "utils.hh"
+#include "window.hh"
 
 #include <algorithm>
 

src/buffer.hh

@@ -1,17 +1,17 @@
 #ifndef buffer_hh_INCLUDED
 #define buffer_hh_INCLUDED
 
+#include "hook_manager.hh"
+#include "line_and_column.hh"
+#include "option_manager.hh"
+#include "string.hh"
+#include "units.hh"
+
 #include <vector>
 #include <list>
 #include <memory>
 #include <unordered_set>
 
-#include "line_and_column.hh"
-#include "option_manager.hh"
-#include "hook_manager.hh"
-#include "string.hh"
-#include "units.hh"
-
 namespace Kakoune
 {
 

src/buffer_manager.cc

@@ -2,10 +2,10 @@
 
 #include "assert.hh"
 #include "buffer.hh"
-#include "exception.hh"
-#include "string.hh"
 #include "client_manager.hh"
+#include "exception.hh"
 #include "file.hh"
+#include "string.hh"
 
 namespace Kakoune
 {

src/color_registry.hh

@@ -1,11 +1,11 @@
 #ifndef color_registry_hh_INCLUDED
 #define color_registry_hh_INCLUDED
 
-#include <unordered_map>
-
 #include "color.hh"
 #include "utils.hh"
 
+#include <unordered_map>
+
 namespace Kakoune
 {
 

src/command_manager.cc

@@ -1,10 +1,10 @@
 #include "command_manager.hh"
 
-#include "utils.hh"
 #include "assert.hh"
 #include "context.hh"
-#include "shell_manager.hh"
 #include "register_manager.hh"
+#include "shell_manager.hh"
+#include "utils.hh"
 
 #include <algorithm>
 

src/command_manager.hh

@@ -1,16 +1,16 @@
 #ifndef command_manager_hh_INCLUDED
 #define command_manager_hh_INCLUDED
 
+#include "completion.hh"
+#include "memoryview.hh"
+#include "shell_manager.hh"
+#include "string.hh"
+#include "utils.hh"
+
 #include <unordered_map>
 #include <functional>
 #include <initializer_list>
 
-#include "string.hh"
-#include "utils.hh"
-#include "completion.hh"
-#include "memoryview.hh"
-#include "shell_manager.hh"
-
 namespace Kakoune
 {
 

src/completion.hh

@@ -1,11 +1,11 @@
 #ifndef completion_hh_INCLUDED
 #define completion_hh_INCLUDED
 
+#include "string.hh"
+
 #include <vector>
 #include <functional>
 
-#include "string.hh"
-
 namespace Kakoune
 {
 

src/display_buffer.hh

@@ -1,14 +1,14 @@
 #ifndef display_buffer_hh_INCLUDED
 #define display_buffer_hh_INCLUDED
 
-#include <vector>
+#include "buffer.hh"
-
-#include "string.hh"
 #include "color.hh"
 #include "line_and_column.hh"
-#include "buffer.hh"
+#include "string.hh"
 #include "utf8.hh"
 
+#include <vector>
+
 namespace Kakoune
 {
 

src/editor.cc

@@ -1,11 +1,10 @@
 #include "editor.hh"
 
 #include "exception.hh"
-#include "utils.hh"
 #include "register.hh"
 #include "register_manager.hh"
-
 #include "utf8_iterator.hh"
+#include "utils.hh"
 
 #include <array>
 

src/exception.cc

@@ -1,6 +1,7 @@
 #include "exception.hh"
 
 #include "string.hh"
+
 #include <typeinfo>
 
 namespace Kakoune

src/file.cc

@@ -1,11 +1,11 @@
 #include "file.hh"
 
+#include "assert.hh"
 #include "buffer.hh"
 #include "buffer_manager.hh"
-#include "assert.hh"
-#include "unicode.hh"
-#include "debug.hh"
 #include "completion.hh"
+#include "debug.hh"
+#include "unicode.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>

src/file.hh

@@ -2,7 +2,6 @@
 #define file_hh_INCLUDED
 
 #include "string.hh"
-
 #include "exception.hh"
 
 namespace Kakoune

src/filter.hh

@@ -1,13 +1,13 @@
 #ifndef filter_hh_INCLUDED
 #define filter_hh_INCLUDED
 
-#include <functional>
+#include "function_group.hh"
-
+#include "function_registry.hh"
+#include "memoryview.hh"
 #include "string.hh"
 #include "utils.hh"
-#include "memoryview.hh"
+
-#include "function_registry.hh"
+#include <functional>
-#include "function_group.hh"
 
 namespace Kakoune
 {

src/filters.cc

@@ -1,4 +1,5 @@
 #include "filters.hh"
+
 #include "buffer.hh"
 #include "selection.hh"
 

src/function_group.hh

@@ -1,9 +1,9 @@
 #ifndef function_group_hh_INCLUDED
 #define function_group_hh_INCLUDED
 
-#include "string.hh"
-#include "idvaluemap.hh"
 #include "exception.hh"
+#include "idvaluemap.hh"
+#include "string.hh"
 
 namespace Kakoune
 {

src/function_registry.hh

@@ -1,9 +1,9 @@
 #ifndef function_registry_h_INCLUDED
 #define function_registry_h_INCLUDED
 
-#include "string.hh"
 #include "completion.hh"
 #include "idvaluemap.hh"
+#include "string.hh"
 
 namespace Kakoune
 {

src/highlighter.hh

@@ -1,13 +1,13 @@
 #ifndef highlighter_hh_INCLUDED
 #define highlighter_hh_INCLUDED
 
-#include <functional>
+#include "function_group.hh"
-
+#include "function_registry.hh"
+#include "memoryview.hh"
 #include "string.hh"
 #include "utils.hh"
-#include "memoryview.hh"
+
-#include "function_registry.hh"
+#include <functional>
-#include "function_group.hh"
 
 namespace Kakoune
 {

src/highlighters.hh

@@ -1,9 +1,8 @@
 #ifndef highlighters_hh_INCLUDED
 #define highlighters_hh_INCLUDED
 
-#include "highlighter.hh"
-
 #include "color.hh"
+#include "highlighter.hh"
 
 namespace Kakoune
 {

src/idvaluemap.hh

@@ -1,9 +1,10 @@
 #ifndef idvaluemap_hh_INCLUDED
 #define idvaluemap_hh_INCLUDED
 
-#include <vector>
 #include "completion.hh"
 
+#include <vector>
+
 namespace Kakoune
 {
 

src/keys.cc

@@ -1,4 +1,5 @@
 #include "keys.hh"
+
 #include "utils.hh"
 
 namespace Kakoune

src/keys.hh

@@ -1,9 +1,10 @@
 #ifndef keys_hh_INCLUDED
 #define keys_hh_INCLUDED
 
-#include <vector>
-#include "unicode.hh"
 #include "string.hh"
+#include "unicode.hh"
+
+#include <vector>
 
 namespace Kakoune
 {

src/line_and_column.hh

@@ -1,8 +1,6 @@
 #ifndef line_and_column_hh_INCLUDED
 #define line_and_column_hh_INCLUDED
 
-#include "units.hh"
-
 namespace Kakoune
 {
 

src/main.cc

@@ -1,26 +1,26 @@
-#include "window.hh"
-#include "buffer.hh"
-#include "shell_manager.hh"
-#include "commands.hh"
-#include "command_manager.hh"
-#include "buffer_manager.hh"
-#include "register_manager.hh"
-#include "selectors.hh"
 #include "assert.hh"
-#include "debug.hh"
+#include "buffer.hh"
-#include "highlighters.hh"
+#include "buffer_manager.hh"
-#include "filters.hh"
-#include "hook_manager.hh"
-#include "option_manager.hh"
-#include "event_manager.hh"
-#include "context.hh"
-#include "ncurses.hh"
-#include "string.hh"
-#include "file.hh"
-#include "color_registry.hh"
-#include "remote.hh"
 #include "client_manager.hh"
+#include "color_registry.hh"
+#include "command_manager.hh"
+#include "commands.hh"
+#include "context.hh"
+#include "debug.hh"
+#include "event_manager.hh"
+#include "file.hh"
+#include "filters.hh"
+#include "highlighters.hh"
+#include "hook_manager.hh"
+#include "ncurses.hh"
+#include "option_manager.hh"
 #include "parameters_parser.hh"
+#include "register_manager.hh"
+#include "remote.hh"
+#include "selectors.hh"
+#include "shell_manager.hh"
+#include "string.hh"
+#include "window.hh"
 
 #if defined(__APPLE__)
 #include <mach-o/dyld.h>

src/memoryview.hh

@@ -1,7 +1,6 @@
 #ifndef memoryview_hh_INCLUDED
 #define memoryview_hh_INCLUDED
 
-#include <cstddef>
 #include <vector>
 #include <initializer_list>
 
@@ -14,6 +13,8 @@ template<typename T>
 class memoryview
 {
 public:
+    using size_t = std::size_t;
+
     memoryview()
         : m_pointer(nullptr), m_size(0) {}
 

src/ncurses.cc

@@ -1,10 +1,9 @@
 #include "ncurses.hh"
 
 #include "display_buffer.hh"
-#include "register_manager.hh"
-
-#include "utf8_iterator.hh"
 #include "event_manager.hh"
+#include "register_manager.hh"
+#include "utf8_iterator.hh"
 
 #include <map>
 

src/ncurses.hh

@@ -1,11 +1,11 @@
 #ifndef ncurses_hh_INCLUDED
 #define ncurses_hh_INCLUDED
 
-#include <ncurses.h>
-
-#include "user_interface.hh"
 #include "display_buffer.hh"
 #include "event_manager.hh"
+#include "user_interface.hh"
+
+#include <ncurses.h>
 
 namespace Kakoune
 {

src/option_manager.cc

@@ -1,4 +1,5 @@
 #include "option_manager.hh"
+
 #include "assert.hh"
 
 #include <sstream>

src/option_manager.hh

@@ -1,10 +1,10 @@
 #ifndef option_manager_hh_INCLUDED
 #define option_manager_hh_INCLUDED
 
-#include "utils.hh"
-#include "exception.hh"
 #include "completion.hh"
+#include "exception.hh"
 #include "option_types.hh"
+#include "utils.hh"
 
 #include <unordered_map>
 

src/option_types.hh

@@ -1,9 +1,9 @@
 #ifndef option_types_hh_INCLUDED
 #define option_types_hh_INCLUDED
 
+#include "exception.hh"
 #include "string.hh"
 #include "units.hh"
-#include "exception.hh"
 
 #include <tuple>
 #include <vector>

src/parameters_parser.hh

@@ -1,9 +1,9 @@
 #ifndef parameters_parser_hh_INCLUDED
 #define parameters_parser_hh_INCLUDED
 
-#include "string.hh"
-#include "memoryview.hh"
 #include "exception.hh"
+#include "memoryview.hh"
+#include "string.hh"
 
 #include <unordered_map>
 

src/register.hh

@@ -1,8 +1,8 @@
 #ifndef register_hh_INCLUDED
 #define register_hh_INCLUDED
 
-#include "string.hh"
 #include "memoryview.hh"
+#include "string.hh"
 
 namespace Kakoune
 {

src/register_manager.cc

@@ -1,7 +1,7 @@
 #include "register_manager.hh"
 
-#include "utils.hh"
 #include "assert.hh"
+#include "utils.hh"
 
 namespace Kakoune
 {

src/register_manager.hh

@@ -2,7 +2,6 @@
 #define register_manager_hh_INCLUDED
 
 #include "register.hh"
-
 #include "utils.hh"
 
 #include <unordered_map>

src/remote.cc

@@ -1,11 +1,11 @@
 #include "remote.hh"
 
-#include "display_buffer.hh"
-#include "debug.hh"
-#include "client_manager.hh"
-#include "event_manager.hh"
 #include "buffer_manager.hh"
+#include "client_manager.hh"
 #include "command_manager.hh"
+#include "debug.hh"
+#include "display_buffer.hh"
+#include "event_manager.hh"
 
 #include <sys/types.h>
 #include <sys/socket.h>

src/remote.hh

@@ -1,9 +1,9 @@
 #ifndef remote_hh_INCLUDED
 #define remote_hh_INCLUDED
 
-#include "user_interface.hh"
 #include "display_buffer.hh"
 #include "event_manager.hh"
+#include "user_interface.hh"
 
 namespace Kakoune
 {

src/selectors.cc

@@ -1,7 +1,6 @@
 #include "selectors.hh"
 
 #include "string.hh"
-
 #include "utf8_iterator.hh"
 
 #include <algorithm>

src/shell_manager.cc

@@ -1,7 +1,7 @@
 #include "shell_manager.hh"
 
-#include "debug.hh"
 #include "context.hh"
+#include "debug.hh"
 
 #include <cstring>
 #include <sys/types.h>

src/shell_manager.hh

@@ -1,8 +1,8 @@
 #ifndef shell_manager_hh_INCLUDED
 #define shell_manager_hh_INCLUDED
 
-#include "utils.hh"
 #include "string.hh"
+#include "utils.hh"
 
 #include <unordered_map>
 

src/string.cc

@@ -1,4 +1,5 @@
 #include "string.hh"
+
 #include "exception.hh"
 
 namespace Kakoune

src/string.hh

@@ -1,13 +1,13 @@
 #ifndef string_hh_INCLUDED
 #define string_hh_INCLUDED
 
-#include <string>
-#include <boost/regex.hpp>
-
 #include "memoryview.hh"
 #include "units.hh"
 #include "utf8.hh"
 
+#include <string>
+#include <boost/regex.hpp>
+
 namespace Kakoune
 {
 

src/unicode.hh

@@ -27,4 +27,3 @@ inline bool is_blank(Codepoint c)
 }
 
 #endif // unicode_hh_INCLUDED
-

src/unit_tests.cc

@@ -1,8 +1,8 @@
-#include "buffer.hh"
 #include "assert.hh"
+#include "buffer.hh"
 #include "editor.hh"
-#include "selectors.hh"
 #include "keys.hh"
+#include "selectors.hh"
 
 using namespace Kakoune;
 

src/user_interface.hh

@@ -1,11 +1,10 @@
 #ifndef user_interface_hh_INCLUDED
 #define user_interface_hh_INCLUDED
 
-#include "memoryview.hh"
-#include "keys.hh"
-#include "units.hh"
-#include "utils.hh"
 #include "color.hh"
+#include "keys.hh"
+#include "memoryview.hh"
+#include "utils.hh"
 
 namespace Kakoune
 {

src/utf8.hh

@@ -1,10 +1,11 @@
 #ifndef utf8_hh_INCLUDED
 #define utf8_hh_INCLUDED
 
-#include <cstddef>
+#include "assert.hh"
 #include "unicode.hh"
 #include "units.hh"
-#include "assert.hh"
+
+#include <cstddef>
 
 namespace Kakoune
 {

src/utils.hh

@@ -1,11 +1,11 @@
 #ifndef utils_hh_INCLUDED
 #define utils_hh_INCLUDED
 
-#include "exception.hh"
 #include "assert.hh"
+#include "exception.hh"
 
-#include <memory>
 #include <algorithm>
+#include <memory>
 #include <vector>
 
 namespace Kakoune

src/window.cc

@@ -1,9 +1,9 @@
 #include "window.hh"
 
 #include "assert.hh"
+#include "context.hh"
 #include "highlighter.hh"
 #include "hook_manager.hh"
-#include "context.hh"
 
 #include <algorithm>
 #include <sstream>

src/window.hh

@@ -1,9 +1,9 @@
 #ifndef window_hh_INCLUDED
 #define window_hh_INCLUDED
 
-#include "editor.hh"
-#include "display_buffer.hh"
 #include "completion.hh"
+#include "display_buffer.hh"
+#include "editor.hh"
 #include "highlighter.hh"
 #include "highlighter.hh"
 #include "hook_manager.hh"