diff options
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py | 2 | ||||
| -rw-r--r-- | lldb/source/Commands/CommandObjectType.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py index 3b16f0a3859..2c2e0843117 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py @@ -62,6 +62,8 @@ class DataFormatterDisablingTestCase(TestBase): self.expect('frame variable string1', matching=False, substrs = ['hello world']) + self.expect('type summary list', substrs=['Category: system (disabled)']) + self.expect('type category list', substrs = ['system','disabled',]) # now enable and check that we are back to normal diff --git a/lldb/source/Commands/CommandObjectType.cpp b/lldb/source/Commands/CommandObjectType.cpp index e26dec018af..0f2db740571 100644 --- a/lldb/source/Commands/CommandObjectType.cpp +++ b/lldb/source/Commands/CommandObjectType.cpp @@ -1351,7 +1351,9 @@ protected: bool any_printed = false; auto category_closure = [&result, &formatter_regex, &any_printed] (const lldb::TypeCategoryImplSP& category) -> void { - result.GetOutputStream().Printf("-----------------------\nCategory: %s\n-----------------------\n", category->GetName()); + result.GetOutputStream().Printf("-----------------------\nCategory: %s%s\n-----------------------\n", + category->GetName(), + category->IsEnabled() ? "" : " (disabled)"); TypeCategoryImpl::ForEachCallbacks<FormatterType> foreach; foreach.SetExact([&result, &formatter_regex, &any_printed] (ConstString name, const FormatterSharedPointer& format_sp) -> bool { |
