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

Clang: Fix fix-its positions calculation

Browse Source 
Code completion does not save the unsaved file contents
in translation unit therefore we need to access unsaved
file directly to calculate the proper UTF-16 column.

Change-Id: I0f217b0d36e0ff94ebc483ed6bef94b55efd311a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-10-15 13:12:19 +02:00
parent 3e93f66c5d
commit 78fbb0826b
4 changed files with 82 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/tools/clangbackend/source/codecompletionsextractor.cpp
View File

@@ -31,19 +31,20 @@
#include "codecompletionchunkconverter.h"
#include "sourcelocation.h"
#include "sourcerange.h"
#include "unsavedfile.h"
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
#include <QDebug>
namespace ClangBackEnd {
CodeCompletionsExtractor::CodeCompletionsExtractor(CXTranslationUnit cxTranslationUnit,
CodeCompletionsExtractor::CodeCompletionsExtractor(const UnsavedFile &unsavedFile,
CXCodeCompleteResults *cxCodeCompleteResults)
: cxTranslationUnit(cxTranslationUnit)
: unsavedFile(unsavedFile)
, cxCodeCompleteResults(cxCodeCompleteResults)
{
}
bool CodeCompletionsExtractor::next()
@@ -342,6 +343,27 @@ void CodeCompletionsExtractor::extractCompletionChunks()
currentCodeCompletion_.chunks = CodeCompletionChunkConverter::extract(currentCxCodeCompleteResult.CompletionString);
}
SourceRangeContainer toRangeContainer(const UnsavedFile &file, CXSourceRange cxSourceRange)
{
const CXSourceLocation start = clang_getRangeStart(cxSourceRange);
const CXSourceLocation end = clang_getRangeEnd(cxSourceRange);
uint startLine = 0;
uint startColumn = 0;
uint endLine = 0;
uint endColumn = 0;
clang_getFileLocation(start, nullptr, &startLine, &startColumn, nullptr);
clang_getFileLocation(end, nullptr, &endLine, &endColumn, nullptr);
QTC_ASSERT(startLine == endLine, return SourceRangeContainer(););
const Utf8String lineText = file.lineRange(startLine, endLine);
startColumn = QString(lineText.mid(0, startColumn - 1)).size() + 1;
endColumn = QString(lineText.mid(0, endColumn - 1)).size() + 1;
return SourceRangeContainer(SourceLocationContainer(file.filePath(), startLine, startColumn),
SourceLocationContainer(file.filePath(), endLine, endColumn));
}
void CodeCompletionsExtractor::extractRequiredFixIts()
{
#ifdef IS_COMPLETION_FIXITS_BACKPORTED
@@ -358,7 +380,7 @@ void CodeCompletionsExtractor::extractRequiredFixIts()
i,
&range);
currentCodeCompletion_.requiredFixIts.push_back(
FixItContainer(Utf8String(fixIt), SourceRange(cxTranslationUnit, range)));
FixItContainer(Utf8String(fixIt), toRangeContainer(unsavedFile, range)));
}
#endif
}