Removed AbstractCodeHandler in favour of direct calls to the CodeHandler.

Author: dinusv

lib/lveditor/include/live/abstractcodehandler.h

@@ -8,7 +8,6 @@ HEADERS += \
     $$PWD/live/projectdocument.h \
     $$PWD/live/codecompletionmodel.h \
     $$PWD/live/codecompletionsuggestion.h \
-    $$PWD/live/abstractcodehandler.h \
     $$PWD/live/editorsettings.h \
     $$PWD/live/documenthandler.h \
     $$PWD/live/editorsettingscategory.h \

lib/lveditor/include/lveditorheaders.pri

@@ -48,8 +48,7 @@
  * \class lv::DocumentHandler
  * \brief Complements TextEdit in handling documents.
  *
- * Forwards everything to the highlighter, has a completion model in case there's a specific code handler attached to it,
- * it can auto-complete code, which is all behavior inherited from the AbstractCodeHandler.
+ * Offers infrastructure for code completion, highlighting and other language specifics.
  *
  * \ingroup lveditor
  */
@@ -101,6 +100,14 @@ void DocumentHandler::setTextEdit(TextEdit *te){
     }
 }
 
+int DocumentHandler::currentCursorPosition() const{
+    return m_textEdit->cursorPosition();
+}
+
+const QChar &DocumentHandler::lastAddedChar() const{
+    return m_lastChar;
+}
+
 
 /**
  * \fn lv::DocumentHandler::classBegin
@@ -188,17 +195,15 @@ void DocumentHandler::findCodeHandler(){
             WorkspaceExtension* le = it.value();
             if ( le->hasLanguageInterceptor() ){
                 QObject* o = le->callLanguageInterceptor(interceptorArgs);
-
-                AbstractCodeHandler* ach = qobject_cast<AbstractCodeHandler*>(o);
-                if ( ach ){
+                if ( o ){
                     vlog("editor-documenthandler").v() << "Found in extension: " << le->name();
 
-                    QQmlEngine::setObjectOwnership(ach, QQmlEngine::CppOwnership);
-                    m_codeHandler = ach;
+                    QQmlEngine::setObjectOwnership(o, QQmlEngine::CppOwnership);
+                    m_codeHandler = o;
 
                     QList<int> features;
                     QMetaObject::invokeMethod(
-                        ach, "languageFeatures", Qt::DirectConnection, Q_RETURN_ARG(QList<int>, features)
+                        o, "languageFeatures", Qt::DirectConnection, Q_RETURN_ARG(QList<int>, features)
                     );
 
                     for ( int feature : features ){
@@ -249,33 +254,6 @@ void DocumentHandler::documentContentsChanged(int position, int, int charsAdded)
     }
 }
 
-/**
- * \brief Slot reacting to cursor position change
- *
- * Potentially triggers the assisted completion
- */
-void DocumentHandler::cursorWritePositionChanged(QTextCursor cursor){
-    if ( m_codeHandler && m_editorFocus && cursor.position() == m_textEdit->cursorPosition() &&
-         !m_projectDocument->editingStateIs(ProjectDocument::Assisted) &&
-         !m_projectDocument->editingStateIs(ProjectDocument::Silent)
-        )
-    {
-        m_projectDocument->addEditingState(ProjectDocument::Assisted);
-        QTextCursor newCursor;
-        m_codeHandler->assistCompletion(
-            cursor,
-            m_lastChar,
-            false,
-            m_completionModel,
-            newCursor
-        );
-        m_projectDocument->removeEditingState(ProjectDocument::Assisted);
-        if ( !newCursor.isNull() ){
-            emit cursorPositionRequest(newCursor.position());
-        }
-    }
-}
-
 /**
  * \brief Document that the document handler is operating on
  *
@@ -292,11 +270,6 @@ void DocumentHandler::setDocument(ProjectDocument *document, QJSValue){
     if (m_projectDocument) {
         m_targetDoc = m_projectDocument->textDocument();
 
-        connect(
-            m_targetDoc, SIGNAL(cursorPositionChanged(QTextCursor)),
-            this, SLOT(cursorWritePositionChanged(QTextCursor))
-        );
-
         if (m_textEdit) {
             m_textEdit->setTextDocument(m_targetDoc);
         }
@@ -318,25 +291,6 @@ void DocumentHandler::setDocument(ProjectDocument *document, QJSValue){
     findCodeHandler();
 }
 
-/**
- * \brief Generates code completion at a given cursor position
- */
-void DocumentHandler::generateCompletion(int cursorPosition){
-    if ( m_targetDoc && m_codeHandler ){
-        m_lastChar = QChar();
-        QTextCursor cursor(m_targetDoc);
-        cursor.setPosition(cursorPosition);
-        QTextCursor newCursor;
-        m_codeHandler->assistCompletion(
-            cursor,
-            m_lastChar,
-            true,
-            m_completionModel,
-            newCursor
-        );
-    }
-}
-
 /**
  * \brief Used to manage indentation of selected text
  *
@@ -378,20 +332,4 @@ bool DocumentHandler::has(int feature){
     return m_languageFeatures.contains(feature);
 }
 
-/**
- * \brief Finds the boundaries of the code block containing the cursor position
- *
- * Mostly used for fragments
- */
-QJSValue DocumentHandler::contextBlockRange(int cursorPosition){
-    if ( !m_codeHandler || !m_engine )
-        return QJSValue();
-
-    QPair<int, int> v = m_codeHandler->contextBlock(cursorPosition);
-    QJSValue ob = m_engine->engine()->newObject();
-    ob.setProperty("start", m_targetDoc->findBlock(v.first).blockNumber());
-    ob.setProperty("end", m_targetDoc->findBlock(v.second).blockNumber());
-    return ob;
-}
-
 }// namespace

lib/lveditor/src/abstractcodehandler.cpp

@@ -26,7 +26,6 @@
 #include "live/projectdocument.h"
 #include "live/lveditorglobal.h"
 #include "live/codecompletionmodel.h"
-#include "live/abstractcodehandler.h"
 
 namespace lv{
 
@@ -40,7 +39,7 @@ class LV_EDITOR_EXPORT DocumentHandler : public QObject, public QQmlParserStatus
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(lv::CodeCompletionModel* completionModel READ completionModel CONSTANT)
-    Q_PROPERTY(lv::AbstractCodeHandler* codeHandler     READ codeHandler     NOTIFY codeHandlerChanged)
+    Q_PROPERTY(QObject*                 codeHandler     READ codeHandler     NOTIFY codeHandlerChanged)
     Q_PROPERTY(bool editorFocus                         READ editorFocus     WRITE setEditorFocus NOTIFY editorFocusChanged)
     Q_ENUMS(LanguageFeatures)
 
@@ -84,6 +83,10 @@ class LV_EDITOR_EXPORT DocumentHandler : public QObject, public QQmlParserStatus
     TextEdit* textEdit();
     void setTextEdit(TextEdit* te);
 
+    int currentCursorPosition() const;
+
+    const QChar& lastAddedChar() const;
+
     /**
      * \brief Shows if the editor is in focus
      */
@@ -93,7 +96,7 @@ class LV_EDITOR_EXPORT DocumentHandler : public QObject, public QQmlParserStatus
     /**
      * \brief Code handler getter
      */
-    AbstractCodeHandler* codeHandler();
+    QObject *codeHandler();
 
     void requestCursorPosition(int position);
 
@@ -104,10 +107,7 @@ class LV_EDITOR_EXPORT DocumentHandler : public QObject, public QQmlParserStatus
 public slots:
     void insertCompletion(int from, int to, const QString& completion);
     void documentContentsChanged(int position, int charsRemoved, int charsAdded);
-    void cursorWritePositionChanged(QTextCursor cursor);
     void setDocument(lv::ProjectDocument* document, QJSValue options = QJSValue());
-    void generateCompletion(int cursorPosition);
-    QJSValue contextBlockRange(int cursorPosition);
 
     void manageIndent(int from, int length, bool undo = false);
 
@@ -133,7 +133,7 @@ public slots:
     QChar                 m_lastChar;
     QTextDocument*        m_targetDoc;
     CodeCompletionModel*  m_completionModel;
-    AbstractCodeHandler*  m_codeHandler;
+    QObject*              m_codeHandler;
     ProjectDocument*      m_projectDocument;
     int                   m_indentSize;
     QString               m_indentContent;
@@ -163,6 +163,7 @@ inline TextEdit *DocumentHandler::textEdit(){
     return m_textEdit;
 }
 
+/** \brief Returns true if the current editor has focus */
 inline bool DocumentHandler::editorFocus() const{
     return m_editorFocus;
 }
@@ -177,7 +178,7 @@ inline void DocumentHandler::setEditorFocus(bool editorFocus){
     emit editorFocusChanged();
 }
 
-inline AbstractCodeHandler *DocumentHandler::codeHandler(){
+inline QObject *DocumentHandler::codeHandler(){
     return m_codeHandler;
 }
 

lib/lveditor/src/abstractcodehandler.h

@@ -11,7 +11,6 @@ HEADERS += \
     $$PWD/keymap.h \
     $$PWD/codecompletionmodel.h \
     $$PWD/codecompletionsuggestion.h \
-    $$PWD/abstractcodehandler.h \
     $$PWD/projectnavigationmodel.h \
     $$PWD/projectdocumentmodel.h \
     $$PWD/editorsettings.h \
@@ -51,7 +50,6 @@ SOURCES += \
     $$PWD/projectdocument.cpp \
     $$PWD/codecompletionmodel.cpp \
     $$PWD/codecompletionsuggestion.cpp \
-    $$PWD/abstractcodehandler.cpp \
     $$PWD/projectnavigationmodel.cpp \
     $$PWD/projectdocumentmodel.cpp \
     $$PWD/editorsettings.cpp \