diff --git a/lldb/source/DataFormatters/FormatManager.cpp b/lldb/source/DataFormatters/FormatManager.cpp --- a/lldb/source/DataFormatters/FormatManager.cpp +++ b/lldb/source/DataFormatters/FormatManager.cpp @@ -582,6 +582,10 @@ std::vector FormatManager::GetCandidateLanguages(lldb::LanguageType lang_type) { switch (lang_type) { + case lldb::eLanguageTypeSwift: + return {lldb::eLanguageTypeSwift, lldb::eLanguageTypeObjC}; + case lldb::eLanguageTypeObjC: + return {lldb::eLanguageTypeObjC, lldb::eLanguageTypeSwift}; case lldb::eLanguageTypeC: case lldb::eLanguageTypeC89: case lldb::eLanguageTypeC99: diff --git a/lldb/unittests/DataFormatter/FormatManagerTests.cpp b/lldb/unittests/DataFormatter/FormatManagerTests.cpp --- a/lldb/unittests/DataFormatter/FormatManagerTests.cpp +++ b/lldb/unittests/DataFormatter/FormatManagerTests.cpp @@ -43,7 +43,11 @@ EXPECT_EQ(FormatManager::GetCandidateLanguages(eLanguageTypeC_plus_plus_14), candidates); - candidates = {eLanguageTypeObjC}; + candidates = {eLanguageTypeObjC, eLanguageTypeSwift}; EXPECT_EQ(FormatManager::GetCandidateLanguages(eLanguageTypeObjC), candidates); + + candidates = {eLanguageTypeSwift, eLanguageTypeObjC}; + EXPECT_EQ(FormatManager::GetCandidateLanguages(eLanguageTypeSwift), + candidates); }