feat(objc_indexer): marked source for category methods (#3311)

Instead of just printing the category name in the marked source for category
methods, print the interface and category, like you would expect. So instead of
Cat::foo we now output Base(Cat)::foo.

kythe/cxx/indexer/cxx/marked_source.cc

@@ -731,6 +731,24 @@ bool MarkedSourceGenerator::ReplaceMarkedSourceWithQualifiedName(
           } else if (const auto* enum_decl =
                          llvm::dyn_cast<clang::EnumDecl>(decl_context)) {
             stream << *enum_decl;
+          } else if (const auto* cat_decl =
+                         llvm::dyn_cast<clang::ObjCCategoryDecl>(decl_context)) {
+            // Print categories methods as
+            // 'InterfaceName(CategoryName)::Method'.
+            if (const auto* i = cat_decl->getClassInterface()) {
+                stream << i->getName();
+            }
+            stream << "(" << cat_decl->getName() << ")";
+          } else if (const auto* cat_impl =
+                         llvm::dyn_cast<clang::ObjCCategoryImplDecl>(decl_context)) {
+            // Print categories methods as
+            // 'InterfaceName(CategoryName)::Method'.
+            if (const auto* decl = cat_impl->getCategoryDecl()) {
+                if (const auto* i = decl->getClassInterface()) {
+                    stream << i->getName();
+                }
+            }
+            stream << "(" << cat_impl->getName() << ")";
           } else {
             stream << *llvm::cast<clang::NamedDecl>(decl_context);
           }

kythe/cxx/indexer/cxx/testdata/BUILD

@@ -2553,6 +2553,17 @@ cc_indexer_test(
     tags = ["marked_source"],
 )
 
+objc_indexer_test(
+    name = "objc_marked_source_category",
+    srcs = ["objc/categories/marked_category.m"],
+    check_for_singletons = True,
+    convert_marked_source = True,
+    tags = [
+        "marked_source",
+        "objc",
+    ],
+)
+
 objc_indexer_test(
     name = "objc_marked_source_class",
     srcs = ["objc/marked_class.m"],

kythe/cxx/indexer/cxx/testdata/objc/categories/marked_category.m

@@ -0,0 +1,80 @@
+// Test marked source with attributes for category methods.
+@class Data;
+
+@interface Base
+@end
+
+@implementation Base
+@end
+
+@interface Base (Cat)
+
+//- @foofunc defines/binding FooFuncDecl
+//- FooFuncDecl code FCDeclRoot
+//- FCDeclRoot child.0 FCDeclInt
+//- FCDeclInt.kind "TYPE"
+//- FCDeclInt.pre_text int
+//- FCDeclRoot child.1 FCDeclParen
+//- FCDeclParen.pre_text ") "
+//- FCDeclRoot child.2 FCDeclIdentRoot
+//- FCDeclIdentRoot child.0 _
+//- FCDeclIdentRoot child.1 FCDeclIdent
+//- FCDeclIdent.pre_text "foofunc:"
+//- @fooP1 defines/binding FooDeclArg1
+//- FooDeclArg1 code ACDeclRoot
+//- ACDeclRoot child.0 ACDeclType
+//- ACDeclType.kind "TYPE"
+//- ACDeclType.pre_text "Data *"
+//- ACDeclRoot child.1 _
+//- ACDeclRoot child.2 ACDeclIdent
+//- ACDeclIdent child.0 ACDeclContext
+//- ACDeclContext.kind "CONTEXT"
+//- ACDeclContext child.0 ACDeclContextIdent
+//- ACDeclContextIdent.kind "IDENTIFIER"
+//- ACDeclContextIdent.pre_text "Base(Cat)"
+//- ACDeclContext child.1 ACDeclContextIdentName
+//- ACDeclContextIdentName.kind "IDENTIFIER"
+//- ACDeclContextIdentName.pre_text "foofunc:"
+//- ACDeclIdent child.1 ACDeclIdentToken
+//- ACDeclIdentToken.kind "IDENTIFIER"
+//- ACDeclIdentToken.pre_text "fooP1"
+- (int) foofunc:(Data *)fooP1;
+
+@end
+
+@implementation Base (Cat)
+
+//- @foofunc defines/binding FooFuncDefn
+//- FooFuncDefn code FCDefnRoot
+//- FCDefnRoot child.0 FCDefnInt
+//- FCDefnInt.kind "TYPE"
+//- FCDefnInt.pre_text int
+//- FCDefnRoot child.1 FCDefnParen
+//- FCDefnParen.pre_text ") "
+//- FCDefnRoot child.2 FCDefnIdentRoot
+//- FCDefnIdentRoot child.0 _
+//- FCDefnIdentRoot child.1 FCDefnIdent
+//- FCDefnIdent.pre_text "foofunc:"
+//- @fooP1 defines/binding FooDArg1
+//- FooDArg1 code ACDefnRoot
+//- ACDefnRoot child.0 ACDefnType
+//- ACDefnType.kind "TYPE"
+//- ACDefnType.pre_text "Data *"
+//- ACDefnRoot child.1 _
+//- ACDefnRoot child.2 ACDefnIdent
+//- ACDefnIdent child.0 ACDefnContext
+//- ACDefnContext.kind "CONTEXT"
+//- ACDefnContext child.0 ACDefnContextIdent
+//- ACDefnContextIdent.kind "IDENTIFIER"
+//- ACDefnContextIdent.pre_text "Base(Cat)"
+//- ACDefnContext child.1 ACDefnContextIdentName
+//- ACDefnContextIdentName.kind "IDENTIFIER"
+//- ACDefnContextIdentName.pre_text "foofunc:"
+//- ACDefnIdent child.1 ACDefnIdentToken
+//- ACDefnIdentToken.kind "IDENTIFIER"
+//- ACDefnIdentToken.pre_text "fooP1"
+- (int) foofunc:(Data *)fooP1 {
+  return 20;
+}
+
+@end