rework the logic to be more general

Author: oontvoo

lldb/source/Commands/CommandObjectSource.cpp

@@ -1175,33 +1175,35 @@ class CommandObjectSourceList : public CommandObjectParsed {
           // Headers aren't always in the DWARF but if they have
           // executable code (eg., inlined-functions) then the callsite's
           // file(s) will be found. So if a header was requested and we got a
-          // primary file, then look thru its support file(s) for the header.
-          lldb::SupportFileSP actual_file_sp =
+          // primary file (ie., something with a different name), then look thru
+          // its support file(s) for the header.
+          lldb::SupportFileSP found_file_sp =
               sc.comp_unit->GetPrimarySupportFile();
-          if (llvm::StringRef(m_options.file_name).ends_with(".h")) {
+
+          if (!llvm::StringRef(found_file_sp->GetSpecOnly().GetPath())
+                   .ends_with(filename)) {
             int support_matches_count = 0;
             for (auto &file : sc.comp_unit->GetSupportFiles()) {
               if (llvm::StringRef(file->GetSpecOnly().GetPath())
                       .ends_with(filename)) {
-                actual_file_sp = file;
+                found_file_sp = file;
                 ++support_matches_count;
               }
             }
             if (support_matches_count == 0) {
               result.AppendErrorWithFormat(
-                  "No file found for requested header: \"%s.\"\n",
-                  m_options.file_name.c_str());
+                  "No file found for requested header: \"%s.\"\n", filename);
               return;
             } else if (support_matches_count > 1) {
               result.AppendErrorWithFormat(
                   "Multiple files found for requested header: \"%s.\"\n",
-                  m_options.file_name.c_str());
+                  filename);
               return;
             }
           }
 
           target.GetSourceManager().DisplaySourceLinesWithLineNumbers(
-              actual_file_sp, m_options.start_line, column, 0,
+              found_file_sp, m_options.start_line, column, 0,
               m_options.num_lines, "", &result.GetOutputStream(),
               GetBreakpointLocations());