From 24f4b73f675c5e128df0ceaf18049aca5cefcff5 Mon Sep 17 00:00:00 2001 From: eidheim Date: Thu, 14 Dec 2017 22:41:33 +0100 Subject: [PATCH] Added CodeCompleteResults move constructor, and fixed cx_completion_sting typo --- src/code_complete_results.h | 3 +++ src/completion_string.cc | 12 ++++++------ src/completion_string.h | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/code_complete_results.h b/src/code_complete_results.h index 31dde32..980d79b 100644 --- a/src/code_complete_results.h +++ b/src/code_complete_results.h @@ -12,6 +12,9 @@ namespace clangmm { CodeCompleteResults(CXTranslationUnit &cx_tu, const std::string &buffer, unsigned line_num, unsigned column); public: + CodeCompleteResults(CodeCompleteResults &&rhs) : cx_results(rhs.cx_results) { + rhs.cx_results = nullptr; + } ~CodeCompleteResults(); CompletionString get(unsigned index) const; unsigned size() const; diff --git a/src/completion_string.cc b/src/completion_string.cc index 1601683..2eeffcf 100644 --- a/src/completion_string.cc +++ b/src/completion_string.cc @@ -5,24 +5,24 @@ clangmm::CompletionChunk::CompletionChunk(std::string text, CompletionChunkKind : text(std::move(text)), kind(kind) {} clangmm::CompletionString::CompletionString(const CXCompletionString &cx_completion_sting) - : cx_completion_sting(cx_completion_sting) {} + : cx_completion_string(cx_completion_sting) {} bool clangmm::CompletionString::available() const { - return clang_getCompletionAvailability(cx_completion_sting) == CXAvailability_Available; + return clang_getCompletionAvailability(cx_completion_string) == CXAvailability_Available; } unsigned clangmm::CompletionString::get_num_chunks() const { - return clang_getNumCompletionChunks(cx_completion_sting); + return clang_getNumCompletionChunks(cx_completion_string); } std::vector clangmm::CompletionString::get_chunks() const { std::vector chunks; for(unsigned i = 0; i < get_num_chunks(); ++i) - chunks.emplace_back(to_string(clang_getCompletionChunkText(cx_completion_sting, i)), - static_cast(clang_getCompletionChunkKind(cx_completion_sting, i))); + chunks.emplace_back(to_string(clang_getCompletionChunkText(cx_completion_string, i)), + static_cast(clang_getCompletionChunkKind(cx_completion_string, i))); return chunks; } std::string clangmm::CompletionString::get_brief_comment() const { - return to_string(clang_getCompletionBriefComment(cx_completion_sting)); + return to_string(clang_getCompletionBriefComment(cx_completion_string)); } diff --git a/src/completion_string.h b/src/completion_string.h index 511f240..c24548b 100644 --- a/src/completion_string.h +++ b/src/completion_string.h @@ -34,7 +34,7 @@ namespace clangmm { std::string get_brief_comment() const; unsigned get_num_chunks() const; - CXCompletionString cx_completion_sting; + CXCompletionString cx_completion_string; }; } // namespace clangmm #endif // COMPLETIONSTRING_H_