caio/clice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CodeCompletion and SignatureHelp.

Browse Source
This commit is contained in:
ykiko
2024-10-27 13:55:30 +08:00
parent e1afd40663
commit 2890873428
5 changed files with 101 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/Feature/CodeCompletion.h
View File

@@ -77,7 +77,8 @@ struct CodeCompletionOption {
namespace clice::feature {
/// Run code completion in given file and location. `compiler` should be
/// set properly if any PCH or PCM is needed.
/// set properly if any PCH or PCM is needed. Each completion requires a
/// new compiler instance.
std::vector<proto::CompletionItem> codeCompletion(Compiler& compiler,
llvm::StringRef filepath,
proto::Position position,

0
include/Feature/SignatureHelp.h Normal file
View File

26
src/Compiler/Compiler.cpp
View File

@@ -78,11 +78,25 @@ void Compiler::generatePCM(llvm::StringRef outpath) {
}
void Compiler::codeCompletion(llvm::StringRef filepath, std::uint32_t line, std::uint32_t column) {
auto& completion = instance->getFrontendOpts().CodeCompletionAt;
completion.FileName = filepath;
completion.Line = line;
completion.Column = column;
buildAST();
auto& location = instance->getFrontendOpts().CodeCompletionAt;
location.FileName = filepath;
location.Line = line;
location.Column = column;
if(content != "") {
auto buffer = llvm::MemoryBuffer::getMemBufferCopy(content);
instance->getPreprocessorOpts().addRemappedFile(filepath, buffer.release());
}
if(!action->BeginSourceFile(*instance, instance->getFrontendOpts().Inputs[0])) {
llvm::errs() << "Failed to begin source file\n";
std::terminate();
}
if(auto error = action->Execute()) {
llvm::errs() << "Failed to execute action: " << error << "\n";
std::terminate();
}
}
void Compiler::ExecuteAction() {
@@ -102,7 +116,7 @@ void Compiler::ExecuteAction() {
// Beacuse CompilerInstance may create new Preprocessor in `BeginSourceFile`,
// So we must need to create TokenCollector here.
// clang::syntax::TokenCollector collector{preproc};
CodeCompleteCollector collect2(*instance);
// CodeCompleteCollector collect2(*instance);
// FIXME: clang-tidy, include-fixer, etc?

35
src/Compiler/CodeCompletion.cpp → src/Feature/CodeCompletion.cpp
View File

@@ -1,13 +1,14 @@
#include <Compiler/CodeComplete.h>
#include <clang/Lex/CodeCompletionHandler.h>
#include <Basic/SourceCode.h>
#include <Compiler/Compiler.h>
#include <Feature/CodeCompletion.h>
namespace clice {
namespace clice::feature {
namespace {
class CodeCompleteConsumer final : public clang::CodeCompleteConsumer {
class CodeCompletionCollector final : public clang::CodeCompleteConsumer {
public:
CodeCompleteConsumer(clang::CodeCompleteOptions options) :
CodeCompletionCollector(clang::CodeCompleteOptions options) :
clang::CodeCompleteConsumer(options), allocator(new clang::GlobalCodeCompletionAllocator()),
info(allocator) {
// TODO:
@@ -41,21 +42,6 @@ public:
}
}
void ProcessOverloadCandidates(clang::Sema& sema,
unsigned CurrentArg,
OverloadCandidate* candidates,
unsigned count,
clang::SourceLocation openParLoc,
bool braced) final {
llvm::outs() << "ProcessOverloadCandidates\n";
auto range = llvm::make_range(candidates, candidates + count);
for(auto& candidate: range) {
switch(candidate.getKind()) {
// case
}
}
}
clang::CodeCompletionAllocator& getAllocator() final {
return *allocator;
}
@@ -71,4 +57,11 @@ private:
} // namespace
} // namespace clice
std::vector<proto::CompletionItem> codeCompletion(Compiler& compiler,
llvm::StringRef filepath,
proto::Position position,
const config::CodeCompletionOption& option) {
// TODO: decode here.
}
} // namespace clice::feature

65
src/Feature/SignatureHelp.cpp Normal file
View File

@@ -0,0 +1,65 @@
#include <Basic/SourceCode.h>
#include <Compiler/Compiler.h>
#include <Feature/SignatureHelp.h>
namespace clice::feature {
namespace {
class SignatureHelpCollector final : public clang::CodeCompleteConsumer {
public:
SignatureHelpCollector(clang::CodeCompleteOptions options) :
clang::CodeCompleteConsumer(options), allocator(new clang::GlobalCodeCompletionAllocator()),
info(allocator) {
// TODO:
}
void ProcessOverloadCandidates(clang::Sema& sema,
unsigned CurrentArg,
OverloadCandidate* candidates,
unsigned count,
clang::SourceLocation openParLoc,
bool braced) final {
llvm::outs() << "ProcessOverloadCandidates\n";
auto range = llvm::make_range(candidates, candidates + count);
for(auto& candidate: range) {
switch(candidate.getKind()) {
case clang::CodeCompleteConsumer::OverloadCandidate::CK_Function: {
break;
}
case clang::CodeCompleteConsumer::OverloadCandidate::CK_FunctionTemplate: {
break;
}
case clang::CodeCompleteConsumer::OverloadCandidate::CK_FunctionType: {
break;
}
case clang::CodeCompleteConsumer::OverloadCandidate::CK_FunctionProtoTypeLoc: {
break;
}
case clang::CodeCompleteConsumer::OverloadCandidate::CK_Template: {
break;
}
case clang::CodeCompleteConsumer::OverloadCandidate::CK_Aggregate: {
break;
}
}
}
}
clang::CodeCompletionAllocator& getAllocator() final {
return *allocator;
}
clang::CodeCompletionTUInfo& getCodeCompletionTUInfo() final {
return info;
}
private:
std::shared_ptr<clang::GlobalCodeCompletionAllocator> allocator;
clang::CodeCompletionTUInfo info;
};
} // namespace
} // namespace clice::feature