[include-fixer] Show better messages on unfound symbols.

[hokein]

Summary

Also some misc tweaks.

[hokein]

Rebase

[hokein]

Abandon this in favor of D20827.

include-fixer/IncludeFixer.cpp

std::string minimizeInclude(StringRef Include,
     return IsSystem ? '<' + Suggestion + '>' : '"' + Suggestion + '"';
   }
 
   /// Get the include fixer context for the queried symbol.
   IncludeFixerContext
   getIncludeFixerContext(const clang::SourceManager &SourceManager,
                          clang::HeaderSearch &HeaderSearch) {
     IncludeFixerContext FixerContext;
-    if (SymbolQueryResults.empty())
-      return FixerContext;
-
-    FixerContext.SymbolIdentifer = QuerySymbol;
+    FixerContext.SymbolIdentifier = QuerySymbol;
     FixerContext.FirstIncludeOffset = FirstIncludeOffset;
     for (const auto &Header : SymbolQueryResults)
       FixerContext.Headers.push_back(
           minimizeInclude(Header, SourceManager, HeaderSearch));
 
     return FixerContext;
   }
 

include-fixer/IncludeFixerContext.h

 #include <vector>
 
 namespace clang {
 namespace include_fixer {
 
 /// \brief A context for the symbol being queried.
 struct IncludeFixerContext {
   /// \brief The symbol name.
-  std::string SymbolIdentifer;
+  std::string SymbolIdentifier;
   /// \brief The headers which have SymbolIdentifier definitions.
   std::vector<std::string> Headers;
   /// \brief The insertion point for new include header.
   unsigned FirstIncludeOffset;
 };
 
 } // namespace include_fixer
 } // namespace clang
 
 #endif // LLVM_CLANG_TOOLS_EXTRA_INCLUDE_FIXER_INCLUDEFIXERCONTEXT_H

include-fixer/tool/ClangIncludeFixer.cpp

int includeFixerMain(int argc, const char **argv) {
 
   if (tool.run(&Factory) != 0) {
     llvm::errs()
         << "Clang died with a fatal error! (incorrect include paths?)\n";
     return 1;
   }
 
   if (OutputHeaders) {
+    if (Context.SymbolIdentifier.empty())
+      return 0;
     // FIXME: Output IncludeFixerContext as YAML.
-    llvm::outs() << Context.SymbolIdentifer << "\n";
+    llvm::outs() << Context.SymbolIdentifier << "\n";
     for (const auto &Header : Context.Headers)
       llvm::outs() << Header << "\n";
     return 0;
   }
 
   if (Context.Headers.empty())
     return 0;
 

include-fixer/tool/clang-include-fixer.py

def main():
   buf = vim.current.buffer
   text = '\n'.join(buf)
 
   # Run command to get all headers.
   command = [binary, "-stdin", "-output-headers", "-db="+args.db,
              "-input="+args.input, vim.current.buffer.name]
   stdout, stderr = execute(command, text)
   lines = stdout.splitlines()
-  if len(lines) < 2:
-    print "No header is included.\n"
+
+  if len(lines) == 0:
+    print "The file is fine, no need to add a header.\n"
+    return;
+
+  if len(lines) == 1:
+    print "Couldn't find a header for {0}.\n".format(lines[0])
     return
 
   # The first line is the symbol name.
   symbol = lines[0]
   # If there is only one suggested header, insert it directly.
   if len(lines) == 2 or maximum_suggested_headers == 1:
     InsertHeaderToVimBuffer(lines[1], text)
     print "Added #include {0} for {1}.\n".format(lines[1], symbol)