Update to neovim api 4

Signed-off-by: Squareys <squareys@googlemail.com>

Author: Squareys

src/CMakeLists.txt

@@ -38,10 +38,10 @@ add_custom_target(generate ALL
            -t ${CMAKE_SOURCE_DIR}/template
            -o ${CMAKE_CURRENT_BINARY_DIR}
 )
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/neovimapi2.cpp PROPERTIES GENERATED TRUE)
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/neovimapi4.cpp PROPERTIES GENERATED TRUE)
 
 # Compile generated sources to a static lib
-add_library(NeovimApi STATIC ${CMAKE_CURRENT_BINARY_DIR}/neovimapi2.cpp)
+add_library(NeovimApi STATIC ${CMAKE_CURRENT_BINARY_DIR}/neovimapi4.cpp)
 target_link_libraries(NeovimApi Magnum::Magnum CorradeNet Corrade::Containers mpack)
 target_compile_features(NeovimApi PRIVATE cxx_std_17)
 add_dependencies(NeovimApi generate)

src/Test/NeoVimApiTest.cpp

@@ -30,7 +30,7 @@
 
 #include "Corrade/Net/Socket.h"
 
-#include "neovimapi2.h"
+#include "neovimapi4.h"
 
 namespace NeovimApi {
 
@@ -39,6 +39,7 @@ using namespace Magnum;
 
 struct Test: TestSuite::Tester {
     explicit Test();
+    ~Test();
 
     void test();
 
@@ -50,11 +51,16 @@ Test::Test() {
         &Test::test,
         &Test::testGenerated
     });
+
+    // TODO find neovim executable
+    //std::system("nvim.exe --headless -c \"call serverstart('127.0.0.1:6666')\" &");
 }
 
-void Test::test() {
-    // ./nvim.exe --headless -c "call serverstart('127.0.0.1:6666')"
+Test::~Test() {
+    //std::system("killall nvim.exe");
+}
 
+void Test::test() {
     char* buffer = nullptr;
     size_t size = 0;
     mpack_writer_t writer;
@@ -107,7 +113,7 @@ void Test::test() {
 }
 
 void Test::testGenerated() {
-    NeovimApi::NeovimApi2 nvim{6666};
+    NeovimApi::NeovimApi4 nvim{6666};
     Object o = nvim.nvim_eval("'hello' . 'world!\n'");
     CORRADE_COMPARE("helloworld!\n", o.s);
 

template/neovimapi.cpp

@@ -42,15 +42,6 @@ void mpack_write(mpack_writer_t* writer, const std::unordered_map<std::string, O
     mpack_finish_map(writer);
 }
 
-template<typename T>
-void mpack_write(mpack_writer_t*) {
-    mpack_start_array(writer, data.size());
-    for(const auto& e : data) {
-        mpack_write(writer, e);
-    }
-    mpack_finish_array(writer);
-}
-
 Object mpack_read_object(mpack_reader_t* reader) {
     Object result{};
     const mpack_tag_t tag = mpack_peek_tag(reader);
@@ -150,6 +141,10 @@ template<>
 Containers::Array<std::string> mpack_read<Containers::Array<std::string>>(mpack_reader_t* reader) {
     return mpack_read_array<std::string>(reader);
 }
+template<>
+Containers::Array<std::unordered_map<std::string, Object>> mpack_read<Containers::Array<std::unordered_map<std::string, Object>>>(mpack_reader_t* reader) {
+    return mpack_read_array<std::unordered_map<std::string, Object>>(reader);
+}
 
 NeovimApi{{api_level}}::NeovimApi{{api_level}}(int port, int receiveBufferSize):
     NeovimApi{{api_level}}{"127.0.0.1", port, receiveBufferSize}
@@ -186,7 +181,7 @@ Int NeovimApi{{api_level}}::dispatch(const std::string& func, Args... args) {
     return msgId;
 }
 
-std::unique_ptr<Notification> NeovimApi2::waitForNotification(Int timeout) {
+std::unique_ptr<Notification> NeovimApi{{api_level}}::waitForNotification(Int timeout) {
     if(!_notifications.empty()) {
         /* Move notification to heap */
         auto n = std::move(_notifications.front());
@@ -203,7 +198,7 @@ std::unique_ptr<Notification> NeovimApi2::waitForNotification(Int timeout) {
             return std::make_unique<Notification>(Containers::Array<char>(nullptr));
         }
         if(response.size() == _receiveBuffer.size()) {
-            Warning() << "NeovimApi2::waitForResponse(): Receive buffer was full";
+            Warning() << "NeovimApi{{api_level}}::waitForResponse(): Receive buffer was full";
             // TODO: Handle requests over multiple buffers
         }