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/clangcodemodel/clangeditordocumentparser.cpp | |
parent | 2fa15f221fc2ff2c36995fe904cc3a4837d62760 (diff) |
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/clangcodemodel/clangeditordocumentparser.cpp')
-rw-r--r-- | src/plugins/clangcodemodel/clangeditordocumentparser.cpp | 128 |
1 files changed, 128 insertions, 0 deletions
diff --git a/src/plugins/clangcodemodel/clangeditordocumentparser.cpp b/src/plugins/clangcodemodel/clangeditordocumentparser.cpp new file mode 100644 index 00000000000..f5e40bf6e28 --- /dev/null +++ b/src/plugins/clangcodemodel/clangeditordocumentparser.cpp @@ -0,0 +1,128 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ + +#include "clangeditordocumentparser.h" +#include "clangutils.h" +#include "pchinfo.h" +#include "pchmanager.h" + +#include <cpptools/cppmodelmanagerinterface.h> +#include <cpptools/cppprojects.h> +#include <cpptools/cppworkingcopy.h> + +#include <utils/hostosinfo.h> +#include <utils/qtcassert.h> + +static const bool DebugTiming = qgetenv("QTC_CLANG_VERBOSE") == "1"; + +namespace { + +QStringList createOptions(const QString &filePath, const CppTools::ProjectPart::Ptr &part) +{ + using namespace ClangCodeModel; + + QStringList options; + if (part.isNull()) + return options; + + options += QLatin1String("-fspell-checking"); + options += ClangCodeModel::Utils::createClangOptions(part, filePath); + + if (Internal::PchInfo::Ptr pchInfo = Internal::PchManager::instance()->pchInfo(part)) + options.append(ClangCodeModel::Utils::createPCHInclusionOptions(pchInfo->fileName())); + + return options; +} + +QString commandLine(const QStringList &options, const QString &fileName) +{ + const QStringList allOptions = QStringList(options) + << QLatin1String("-fsyntax-only") << fileName; + QStringList allOptionsQuoted; + foreach (const QString &option, allOptions) + allOptionsQuoted.append(QLatin1Char('\'') + option + QLatin1Char('\'')); + return ::Utils::HostOsInfo::withExecutableSuffix(QLatin1String("clang")) + + QLatin1Char(' ') + allOptionsQuoted.join(QLatin1Char(' ')); +} + +} // anonymous namespace + +namespace ClangCodeModel { + +ClangEditorDocumentParser::ClangEditorDocumentParser(const QString &filePath) + : BaseEditorDocumentParser(filePath) + , m_marker(new ClangCodeModel::SemanticMarker) +{ +} + +void ClangEditorDocumentParser::update(CppTools::WorkingCopy workingCopy) +{ + QTC_ASSERT(m_marker, return); + QMutexLocker lock(m_marker->mutex()); + QMutexLocker lock2(&m_mutex); + + updateProjectPart(); + const QStringList options = createOptions(filePath(), projectPart()); + + QTime t; + if (DebugTiming) { + qDebug("*** Reparse options (cmd line equivalent): %s", + commandLine(options, filePath()).toUtf8().constData()); + t.start(); + } + + m_marker->setFileName(filePath()); + m_marker->setCompilationOptions(options); + const Internal::UnsavedFiles unsavedFiles = Utils::createUnsavedFiles(workingCopy); + m_marker->reparse(unsavedFiles); + + if (DebugTiming) + qDebug() << "*** Reparse took" << t.elapsed() << "ms."; +} + +QList<Diagnostic> ClangEditorDocumentParser::diagnostics() const +{ + QTC_ASSERT(m_marker, return QList<Diagnostic>()); + QMutexLocker(m_marker->mutex()); + return m_marker->diagnostics(); +} + +QList<SemanticMarker::Range> ClangEditorDocumentParser::ifdefedOutBlocks() const +{ + QTC_ASSERT(m_marker, return QList<SemanticMarker::Range>()); + QMutexLocker(m_marker->mutex()); + return m_marker->ifdefedOutBlocks(); +} + +SemanticMarker::Ptr ClangEditorDocumentParser::semanticMarker() const +{ + return m_marker; +} + +} // namespace ClangCodeModel |