feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Provide the language option to the backend

Browse Source 
Provide the language option (e.g. "-x c++-header") when registering a
translation unit for the editor.

Task-number: QTCREATORBUG-14787
Change-Id: Ie06f9fdab302f1b21ba72cdb65b6aabf9f7bc04c
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-11-05 13:57:57 +01:00
parent 08fcb7f317
commit 23fa5a7efd
21 changed files with 228 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/tools/clangbackend/ipcsource/translationunit.cpp
View File

@@ -32,6 +32,7 @@
#include "clangstring.h"
#include "codecompleter.h"
#include "commandlinearguments.h"
#include "diagnosticset.h"
#include "projectpart.h"
#include "translationunitfilenotexitexception.h"
@@ -50,6 +51,11 @@
static Q_LOGGING_CATEGORY(verboseLibLog, "qtc.clangbackend.verboselib");
static bool isVerboseModeEnabled()
{
return verboseLibLog().isDebugEnabled();
}
namespace ClangBackEnd {
class TranslationUnitData
@@ -57,6 +63,7 @@ class TranslationUnitData
public:
TranslationUnitData(const Utf8String &filePath,
const ProjectPart &projectPart,
const Utf8StringVector &fileArguments,
TranslationUnits &translationUnits);
~TranslationUnitData();
@@ -65,6 +72,7 @@ public:
time_point lastProjectPartChangeTimePoint;
QSet<Utf8String> dependedFilePaths;
ProjectPart projectPart;
Utf8StringVector fileArguments;
Utf8String filePath;
CXTranslationUnit translationUnit = nullptr;
CXIndex index = nullptr;
@@ -75,10 +83,12 @@ public:
TranslationUnitData::TranslationUnitData(const Utf8String &filePath,
const ProjectPart &projectPart,
const Utf8StringVector &fileArguments,
TranslationUnits &translationUnits)
: translationUnits(translationUnits),
lastProjectPartChangeTimePoint(std::chrono::steady_clock::now()),
projectPart(projectPart),
fileArguments(fileArguments),
filePath(filePath)
{
dependedFilePaths.insert(filePath);
@@ -92,9 +102,13 @@ TranslationUnitData::~TranslationUnitData()
TranslationUnit::TranslationUnit(const Utf8String &filePath,
const ProjectPart &projectPart,
const Utf8StringVector &fileArguments,
TranslationUnits &translationUnits,
FileExistsCheck fileExistsCheck)
: d(std::make_shared<TranslationUnitData>(filePath, projectPart, translationUnits))
: d(std::make_shared<TranslationUnitData>(filePath,
projectPart,
fileArguments,
translationUnits))
{
if (fileExistsCheck == CheckIfFileExists)
checkIfFileExists();
@@ -122,7 +136,7 @@ CXIndex TranslationUnit::index() const
checkIfNull();
if (!d->index) {
const bool displayDiagnostics = verboseLibLog().isDebugEnabled();
const bool displayDiagnostics = isVerboseModeEnabled();
d->index = clang_createIndex(1, displayDiagnostics);
}
@@ -261,10 +275,14 @@ void TranslationUnit::createTranslationUnitIfNeeded() const
{
if (!d->translationUnit) {
d->translationUnit = CXTranslationUnit();
const bool verboseMode = isVerboseModeEnabled();
const CommandLineArguments args(d->projectPart.arguments(), d->fileArguments, verboseMode);
CXErrorCode errorCode = clang_parseTranslationUnit2(index(),
d->filePath.constData(),
d->projectPart.cxArguments(),
d->projectPart.argumentCount(),
args.data(),
args.count(),
unsavedFiles().cxUnsavedFiles(),
unsavedFiles().count(),
defaultOptions(),