diff options
Diffstat (limited to 'clang-tools-extra/include-fixer/tool/clang-include-fixer.py')
| -rw-r--r-- | clang-tools-extra/include-fixer/tool/clang-include-fixer.py | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/clang-tools-extra/include-fixer/tool/clang-include-fixer.py b/clang-tools-extra/include-fixer/tool/clang-include-fixer.py index d09b55a5252..b942cbb47a9 100644 --- a/clang-tools-extra/include-fixer/tool/clang-include-fixer.py +++ b/clang-tools-extra/include-fixer/tool/clang-include-fixer.py @@ -149,21 +149,16 @@ def main(): return try: - # If there is only one suggested header, insert it directly. - if len(unique_headers) == 1 or maximum_suggested_headers == 1: - InsertHeaderToVimBuffer({"QuerySymbolInfos": query_symbol_infos, - "HeaderInfos": header_infos}, text) - print "Added #include {0} for {1}.".format(unique_headers[0], symbol) - return - - selected = GetUserSelection("choose a header file for {0}.".format(symbol), - unique_headers, maximum_suggested_headers) - selected_header_infos = [ - header for header in header_infos if header["Header"] == selected] - - # Insert a selected header. - InsertHeaderToVimBuffer({"QuerySymbolInfos": query_symbol_infos, - "HeaderInfos": selected_header_infos}, text) + inserted_header_infos = header_infos + if len(unique_headers) > 1: + selected = GetUserSelection( + "choose a header file for {0}.".format(symbol), + unique_headers, maximum_suggested_headers) + inserted_header_infos = [ + header for header in header_infos if header["Header"] == selected] + include_fixer_context["HeaderInfos"] = inserted_header_infos + + InsertHeaderToVimBuffer(include_fixer_context, text) print "Added #include {0} for {1}.".format(selected, symbol) except Exception as error: print >> sys.stderr, error.message |
