Added information about source file location in code-completions

Author: cmaglie

CodeCompletion.cpp

@@ -51,11 +51,12 @@ using namespace std;
 class CustomCodeCompleteConsumer : public CodeCompleteConsumer {
     CodeCompletionTUInfo TUInfo;
     json output;
+    SourceManager &sm;
 
 public:
 
-    CustomCodeCompleteConsumer(const CodeCompleteOptions &opts) : CodeCompleteConsumer(opts, false),
-    TUInfo(std::make_shared<GlobalCodeCompletionAllocator>()), output(json::array()) {
+    CustomCodeCompleteConsumer(const CodeCompleteOptions &opts, SourceManager &sm) : CodeCompleteConsumer(opts, false),
+    TUInfo(std::make_shared<GlobalCodeCompletionAllocator>()), output(json::array()), sm(sm) {
     }
 
     void ProcessCodeCompleteResults(Sema &s, CodeCompletionContext ctx, CodeCompletionResult *res, unsigned n) override {
@@ -64,7 +65,7 @@ class CustomCodeCompleteConsumer : public CodeCompleteConsumer {
             raw_string_ostream OS(ccStr);
             CodeCompletionString *ccs = res[i].CreateCodeCompletionString(s, ctx, getAllocator(), TUInfo, includeBriefComments());
             //cout << encode(res[i], ccs).dump(2) << "\n";
-            output.push_back(encode(res[i], ccs));
+            output.push_back(encode(res[i], ccs, sm));
         }
 
     }
@@ -139,12 +140,15 @@ void DoCodeCompletion(const string &filename, const string &code, int line, int
     lOpts.Bool = true;
     lOpts.GNUMode = true;
 
+    ci.createFileManager();
+    ci.createSourceManager(ci.getFileManager());
+
     CodeCompleteOptions ccOpts;
     ccOpts.IncludeMacros = 1;
     ccOpts.IncludeCodePatterns = 1;
     ccOpts.IncludeGlobals = 1;
     ccOpts.IncludeBriefComments = 1;
-    CustomCodeCompleteConsumer *ccConsumer = new CustomCodeCompleteConsumer(ccOpts);
+    CustomCodeCompleteConsumer *ccConsumer = new CustomCodeCompleteConsumer(ccOpts, ci.getSourceManager());
     ci.setCodeCompletionConsumer(ccConsumer);
 
     FrontendOptions& fOpts = ci.getFrontendOpts();

JsonImpl.hpp

@@ -205,27 +205,38 @@ inline json encode(const CodeCompletionString *ccs) {
     return res;
 }
 
-inline json encode(const CodeCompletionResult &cc, const CodeCompletionString *ccs) {
+inline json encode(const CodeCompletionResult &cc, const CodeCompletionString *ccs, const SourceManager &sm) {
     // TODO: To obtain the complete documentation comment we must
     // explore cc.Declaration AST
     //cc.Declaration->dump();
 
-    string type;
+    json res = json{
+        {"completion", encode(ccs)}
+    };
     switch (cc.Kind) {
         case CodeCompletionResult::RK_Declaration:
-            type = "declaration";
+        {
+            SourceLocation loc = cc.Declaration->getLocation();
+            PresumedLoc presumedLoc = sm.getPresumedLoc(loc);
+            res["location"] = presumedLoc.getFilename();
+            res["type"] = "Declaration";
             break;
+        }
         case CodeCompletionResult::RK_Keyword:
-            type = "keyword";
+        {
+            res["type"] = "Keyword";
             break;
+        }
         case CodeCompletionResult::RK_Pattern:
-            type = "pattern";
+        {
+            res["type"] = "Pattern";
             break;
+        }
         case CodeCompletionResult::RK_Macro:
-            type = "macro";
+        {
+            res["type"] = "Macro";
             break;
+        }
     };
-    return json{
-        {"type", type},
-        {"completion", encode(ccs)}};
+    return res;
 }