diff options
author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-08-19 15:59:29 +0200 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-08-25 13:06:01 +0200 |
commit | 89bd4ee3c4e4be4b39dee9ef12e798d21be3d2cb (patch) | |
tree | 520ad32c8ff76c22e3ea41006c07012c3053d1d9 /src/plugins/cpptools/cppmodelmanagerinterface.h | |
parent | 2fa15f221fc2ff2c36995fe904cc3a4837d62760 (diff) | |
download | qt-creator-89bd4ee3c4e4be4b39dee9ef12e798d21be3d2cb.tar.gz |
C++: Base parsing on editor document instead of widget
This mainly takes CppEditorSupport apart.
* Parsing is now invoked by CPPEditorDocument itself by listening to
QTextDocument::contentsChanged().
* Upon construction and destruction CPPEditorDocument creates and
deletes an EditorDocumentHandle for (un)registration in the model
manager. This handle provides everything to generate the working copy
and to access the editor document processor.
* A CPPEditorDocument owns a BaseEditorDocumentProcessor instance that
controls parsing, semantic info recalculation and the semantic
highlighting for the document. This is more or less what is left from
CppEditorSupport and can be considered as the backend of a
CPPEditorDocument. CPPEditorDocument itself is quite small.
* BuiltinEditorDocumentProcessor and ClangEditorDocumentProcessor
derive from BaseEditorDocumentProcessor and implement the gaps.
* Since the semantic info calculation was bound to the widget, it
also calculated the local uses, which depend on the cursor
position. This calculation got moved into the extracted class
UseSeletionsUpdater in the cppeditor plugin, which is run once the
cursor position changes or the semantic info document is updated.
* Some more logic got extracted:
- SemanticInfoUpdater (logic was in CppEditorSupport)
- SemanticHighlighter (logic was in CppEditorSupport)
* The *Parser and *Processor classes can be easily accessed by the
static function get().
* CppHighlightingSupport is gone since it turned out to be useless.
* The editor dependency in CompletionAssistProviders is gone since we
actually only need the file path now.
Change-Id: I49d3a7bd138c5ed9620123e34480772535156508
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanagerinterface.h')
-rw-r--r-- | src/plugins/cpptools/cppmodelmanagerinterface.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/plugins/cpptools/cppmodelmanagerinterface.h b/src/plugins/cpptools/cppmodelmanagerinterface.h index 53120715fd..f48950499f 100644 --- a/src/plugins/cpptools/cppmodelmanagerinterface.h +++ b/src/plugins/cpptools/cppmodelmanagerinterface.h @@ -52,9 +52,9 @@ namespace Utils { class FileName; } namespace CppTools { class AbstractEditorSupport; +class BaseEditorDocumentProcessor; class CppCompletionAssistProvider; -class CppEditorSupport; -class CppHighlightingSupport; +class EditorDocumentHandle; class CppIndexingSupport; class ModelManagerSupport; class WorkingCopy; @@ -95,8 +95,10 @@ public: virtual void addExtraEditorSupport(CppTools::AbstractEditorSupport *editorSupport) = 0; virtual void removeExtraEditorSupport(CppTools::AbstractEditorSupport *editorSupport) = 0; - virtual CppEditorSupport *cppEditorSupport(TextEditor::BaseTextEditor *textEditor) = 0; - virtual void deleteCppEditorSupport(TextEditor::BaseTextEditor *textEditor) = 0; + + virtual EditorDocumentHandle *editorDocument(const QString &filePath) = 0; + virtual void registerEditorDocument(EditorDocumentHandle *editorDocument) = 0; + virtual void unregisterEditorDocument(const QString &filePath) = 0; virtual QList<int> references(CPlusPlus::Symbol *symbol, const CPlusPlus::LookupContext &context) = 0; @@ -108,14 +110,13 @@ public: virtual void renameMacroUsages(const CPlusPlus::Macro ¯o, const QString &replacement = QString()) = 0; virtual void findMacroUsages(const CPlusPlus::Macro ¯o) = 0; - virtual void setIfdefedOutBlocks(const QString &fileName, - const QList<TextEditor::BlockRange> &ifdeffedOutBlocks) = 0; + virtual void finishedRefreshingSourceFiles(const QStringList &files) = 0; virtual void addModelManagerSupport(ModelManagerSupport *modelManagerSupport) = 0; virtual ModelManagerSupport *modelManagerSupportForMimeType(const QString &mimeType) const = 0; virtual CppCompletionAssistProvider *completionAssistProvider(const QString &mimeType) const = 0; - virtual CppHighlightingSupport *highlightingSupport( - TextEditor::BaseTextDocument *baseTextDocument) const = 0; + virtual BaseEditorDocumentProcessor *editorDocumentProcessor( + TextEditor::BaseTextDocument *baseTextDocument) const = 0; virtual void setIndexingSupport(CppTools::CppIndexingSupport *indexingSupport) = 0; virtual CppIndexingSupport *indexingSupport() = 0; |