fakevim update (#2166, #2134)

* Remove fakevim submodule

* Update FakeVim

Author: Waqar144

.gitmodules

@@ -13,9 +13,6 @@
 [submodule "src/libraries/qtcsv"]
 	path = src/libraries/qtcsv
 	url = https://github.com/pbek/qtcsv.git
-[submodule "src/libraries/fakevim"]
-	path = src/libraries/fakevim
-	url = https://github.com/pbek/FakeVim.git
 [submodule "src/libraries/md4c"]
 	path = src/libraries/md4c
 	url = https://github.com/qownnotes/md4c

src/QOwnNotes.pro

@@ -331,7 +331,7 @@ include(libraries/piwiktracker/piwiktracker.pri)
 include(libraries/botan/botan.pri)
 include(libraries/qkeysequencewidget/qkeysequencewidget/qkeysequencewidget.pri)
 include(libraries/qttoolbareditor/toolbar_editor.pri)
-include(libraries/fakevim/fakevim/fakevim.pri)
+include(libraries/fakevim/fakevim.pri)
 include(libraries/singleapplication/singleapplication.pri)
 include(libraries/sonnet/src/core/sonnet-core.pri)
 include(libraries/qhotkey/qhotkey.pri)

src/helpers/fakevimproxy.cpp

@@ -73,7 +73,7 @@ void FakeVimProxy::highlightMatches(const QString &pattern) {
     updateExtraSelections();
 }
 
-void FakeVimProxy::changeStatusMessage(const QString &contents, int cursorPos) {
+void FakeVimProxy::changeStatusMessage(const QString &contents, int cursorPos, int anchorPos, int messageLevel) {
     m_statusMessage =
         cursorPos == -1
             ? contents
@@ -189,8 +189,7 @@ void FakeVimProxy::indentRegion(int beginBlock, int endBlock, QChar typedChar) {
     auto *ed = qobject_cast<QPlainTextEdit *>(m_widget);
     if (!ed) return;
 
-    const auto indentSize =
-        theFakeVimSetting(FakeVim::Internal::ConfigShiftWidth)->value().toInt();
+    const qint64 indentSize = FakeVim::Internal::fakeVimSettings()->shiftWidth.value();
 
     QTextDocument *doc = ed->document();
     QTextBlock startBlock = doc->findBlockByNumber(beginBlock);
@@ -211,9 +210,9 @@ void FakeVimProxy::indentRegion(int beginBlock, int endBlock, QChar typedChar) {
             const auto previousLine =
                 previousBlock.isValid() ? previousBlock.text() : QString();
 
-            int indent = firstNonSpace(previousLine);
+            qint64 indent = firstNonSpace(previousLine);
             if (typedChar == '}')
-                indent = std::max(0, indent - indentSize);
+                indent = std::max(0, int(indent - indentSize));
             else if (previousLine.endsWith(QLatin1String("{")))
                 indent += indentSize;
             const auto indentString = QStringLiteral(" ").repeated(indent);

src/helpers/fakevimproxy.h

@@ -26,7 +26,7 @@ class FakeVimProxy : public QObject {
 
     void highlightMatches(const QString &pattern);
 
-    void changeStatusMessage(const QString &contents, int cursorPos);
+    void changeStatusMessage(const QString &contents, int cursorPos, int anchorPos, int messageLevel);
 
     void changeExtraInformation(const QString &info);
 

src/libraries/fakevim

@@ -0,0 +1,74 @@
+cmake_minimum_required(VERSION 3.0)
+project(fakevim VERSION 0.0.1)
+
+# Library name
+set(bin fakevim)
+
+# Public headers
+set(${bin}_public_headers
+    fakevim/fakevimactions.h
+    fakevim/fakevimhandler.h
+    )
+
+# Source files common for all platforms
+set(${bin}_sources
+    fakevim/fakevimactions.cpp
+    fakevim/fakevimhandler.cpp
+    fakevim/utils/hostosinfo.cpp
+    fakevim/utils/osspecificaspects.h
+    fakevim/utils/qtcassert.cpp
+    ${${bin}_public_headers}
+    )
+
+# Required pkg-config packages
+set(${bin}_pkg_config_requires)
+
+include(cmake/cxx17.cmake)
+include(cmake/library.cmake)
+include(cmake/qt.cmake)
+include(cmake/pkg-config.cmake)
+
+# Files with Q_OBJECT macros to pass to moc utility
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+qt5_wrap_cpp(${bin}_mocced "fakevim/fakevimhandler.h")
+target_sources(${bin} PRIVATE ${${bin}_mocced})
+
+target_compile_definitions(${bin} PRIVATE
+    QT_NO_CAST_TO_ASCII
+    QT_RESTRICTED_CAST_FROM_ASCII
+    QTCREATOR_UTILS_STATIC_LIB
+)
+
+option(BUILD_TESTS "Build tests")
+if (BUILD_TESTS)
+    message(STATUS "Building tests")
+
+    find_package(Qt5Test REQUIRED)
+
+    add_executable(fakevim_test
+        tests/fakevim_test.cpp
+        tests/fakevimplugin.h
+        example/editor.cpp
+    )
+    set_property(TARGET fakevim_test PROPERTY AUTOMOC ON)
+    target_link_libraries(fakevim_test fakevim Qt5::Widgets Qt5::Test)
+
+    target_include_directories(fakevim_test PRIVATE
+        ${CMAKE_SOURCE_DIR}/fakevim
+        ${CMAKE_SOURCE_DIR}
+        )
+
+    add_test(fakevim_test fakevim_test)
+    enable_testing()
+endif()
+
+option(BUILD_EXAMPLE "Build example")
+if (BUILD_EXAMPLE)
+    message(STATUS "Building example")
+
+    add_executable(fakevim_example example/main.cpp example/editor.cpp)
+    set_property(TARGET fakevim_example PROPERTY AUTOMOC ON)
+
+    target_link_libraries(fakevim_example fakevim)
+    target_link_libraries(fakevim_example Qt5::Widgets)
+endif()

src/libraries/fakevim/CMakeLists.txt

@@ -0,0 +1,22 @@
+Digia Qt LGPL Exception version 1.1
+
+As an additional permission to the GNU Lesser General Public License version
+2.1, the object code form of a "work that uses the Library" may incorporate
+material from a header file that is part of the Library.  You may distribute
+such object code under terms of your choice, provided that:
+    (i)   the header files of the Library have not been modified; and
+    (ii)  the incorporated material is limited to numerical parameters, data
+          structure layouts, accessors, macros, inline functions and
+          templates; and
+    (iii) you comply with the terms of Section 6 of the GNU Lesser General
+          Public License version 2.1.
+
+Moreover, you may apply this exception to a modified version of the Library,
+provided that such modification does not involve copying material from the
+Library into the modified Library's header files unless such material is
+limited to (i) numerical parameters; (ii) data structure layouts;
+(iii) accessors; and (iv) small macros, templates and inline functions of
+five lines or less in length.
+
+Furthermore, you are not required to apply this additional permission to a
+modified version of the Library.