TextEditor: Move isAsynchronous() up to IAssistProvider

...from CompletionAssistProvider, so other providers can be executed
asynchronously, too.

Change-Id: I6ec06f6d76bc2937bc272450b4e8dffd81ee868e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

src/plugins/cppeditor/cppquickfixassistant.cpp

@@ -46,6 +46,11 @@ using namespace CPlusPlus;
 // -------------------------
 // CppQuickFixAssistProvider
 // -------------------------
+bool CppQuickFixAssistProvider::isAsynchronous() const
+{
+    return false;
+}
+
 bool CppQuickFixAssistProvider::supportsEditor(const Core::Id &editorId) const
 {
     return editorId == CppEditor::Constants::CPPEDITOR_ID;

src/plugins/cppeditor/cppquickfixassistant.h

@@ -86,6 +86,7 @@ private:
 class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
 {
 public:
+    virtual bool isAsynchronous() const;
     virtual bool supportsEditor(const Core::Id &editorId) const;
     virtual TextEditor::IAssistProcessor *createProcessor() const;
 

src/plugins/qmljseditor/qmljsquickfixassist.cpp

@@ -96,6 +96,11 @@ QmlJSQuickFixAssistProvider::QmlJSQuickFixAssistProvider()
 QmlJSQuickFixAssistProvider::~QmlJSQuickFixAssistProvider()
 {}
 
+bool QmlJSQuickFixAssistProvider::isAsynchronous() const
+{
+    return false;
+}
+
 bool QmlJSQuickFixAssistProvider::supportsEditor(const Core::Id &editorId) const
 {
     return editorId == Constants::C_QMLJSEDITOR_ID;

src/plugins/qmljseditor/qmljsquickfixassist.h

@@ -77,6 +77,7 @@ public:
     QmlJSQuickFixAssistProvider();
     virtual ~QmlJSQuickFixAssistProvider();
 
+    virtual bool isAsynchronous() const;
     virtual bool supportsEditor(const Core::Id &editorId) const;
     virtual TextEditor::IAssistProcessor *createProcessor() const;
 

src/plugins/texteditor/circularclipboardassist.cpp

@@ -112,6 +112,11 @@ public:
 } // namespace Internal
 } // namespace TextEditor
 
+bool ClipboardAssistProvider::isAsynchronous() const
+{
+    return false;
+}
+
 bool ClipboardAssistProvider::supportsEditor(const Core::Id &/*editorId*/) const
 {
     return true;

src/plugins/texteditor/circularclipboardassist.h

@@ -38,6 +38,7 @@ namespace Internal {
 class ClipboardAssistProvider: public IAssistProvider
 {
 public:
+    bool isAsynchronous() const;
     virtual bool supportsEditor(const Core::Id &editorId) const;
     virtual IAssistProcessor *createProcessor() const;
 };

src/plugins/texteditor/codeassist/codeassistant.cpp

@@ -123,7 +123,7 @@ private:
     CompletionAssistProvider *m_completionProvider;
     QList<QuickFixAssistProvider *> m_quickFixProviders;
     Internal::ProcessorRunner *m_requestRunner;
-    CompletionAssistProvider *m_requestProvider;
+    IAssistProvider *m_requestProvider;
     AssistKind m_assistKind;
     IAssistProposalWidget *m_proposalWidget;
     QScopedPointer<IAssistProposal> m_proposal;
@@ -258,22 +258,18 @@ void CodeAssistantPrivate::requestProposal(AssistReason reason,
     if (!assistInterface)
         return;
 
-    if (kind == Completion) {
+    if (provider->isAsynchronous()) {
-        CompletionAssistProvider *completionProvider =
+        m_requestProvider = provider;
-                static_cast<CompletionAssistProvider *>(provider);
+        m_requestRunner = new ProcessorRunner;
-        if (completionProvider->isAsynchronous()) {
+        connect(m_requestRunner, SIGNAL(finished()), this, SLOT(proposalComputed()));
-            m_requestProvider = completionProvider;
+        connect(m_requestRunner, SIGNAL(finished()), this, SLOT(finalizeRequest()));
-            m_requestRunner = new ProcessorRunner;
+        connect(m_requestRunner, SIGNAL(finished()), this, SIGNAL(finished()));
-            connect(m_requestRunner, SIGNAL(finished()), this, SLOT(proposalComputed()));
+        assistInterface->prepareForAsyncUse();
-            connect(m_requestRunner, SIGNAL(finished()), this, SLOT(finalizeRequest()));
+        m_requestRunner->setReason(reason);
-            connect(m_requestRunner, SIGNAL(finished()), this, SIGNAL(finished()));
+        m_requestRunner->setProcessor(processor);
-            assistInterface->prepareForAsyncUse();
+        m_requestRunner->setAssistInterface(assistInterface);
-            m_requestRunner->setReason(reason);
+        m_requestRunner->start();
-            m_requestRunner->setProcessor(processor);
+        return;
-            m_requestRunner->setAssistInterface(assistInterface);
-            m_requestRunner->start();
-            return;
-        }
     }
 
     if (IAssistProposal *newProposal = processor->perform(assistInterface))
@@ -502,12 +498,16 @@ bool CodeAssistantPrivate::eventFilter(QObject *o, QEvent *e)
         } else if (type == QEvent::KeyPress) {
             QKeyEvent *keyEvent = static_cast<QKeyEvent *>(e);
             const QString &keyText = keyEvent->text();
+
+            CompletionAssistProvider *completionProvider = 0;
             if ((keyText.isEmpty()
                  && keyEvent->key() != Qt::LeftArrow
                  && keyEvent->key() != Qt::RightArrow
                  && keyEvent->key() != Qt::Key_Shift)
-                    || (!keyText.isEmpty() &&
+                || (!keyText.isEmpty()
-                        !m_requestProvider->isContinuationChar(keyText.at(0)))) {
+                    && (((completionProvider = dynamic_cast<CompletionAssistProvider *>(m_requestProvider))
+                            ? !completionProvider->isContinuationChar(keyText.at(0))
+                            : false)))) {
                 destroyContext();
             } else if (!keyText.isEmpty() && !m_receivedContentWhileWaiting) {
                 m_receivedContentWhileWaiting = true;

src/plugins/texteditor/codeassist/iassistprovider.cpp

@@ -49,6 +49,12 @@ using namespace TextEditor;
     \sa IAssistProposal, IAssistProcessor
 */
 
+/*!
+    \fn bool TextEditor::IAssistProvider::isAsynchronous() const;
+
+    Returns whether this provider runs asynchronously.
+*/
+
 /*!
     \fn bool TextEditor::IAssistProvider::supportsEditor(const Core::Id &editorId) const
 

src/plugins/texteditor/codeassist/iassistprovider.h

@@ -46,6 +46,7 @@ class TEXTEDITOR_EXPORT IAssistProvider : public QObject
 public:
     IAssistProvider() {}
 
+    virtual bool isAsynchronous() const = 0;
     virtual bool supportsEditor(const Core::Id &editorId) const = 0;
     virtual IAssistProcessor *createProcessor() const = 0;
 };